Sun, 01 Feb 2015 18:26:32 +0100
Regenerated source docu.
--- a/APIs/Python3/eric6.api Sun Feb 01 18:25:31 2015 +0100 +++ b/APIs/Python3/eric6.api Sun Feb 01 18:26:32 2015 +0100 @@ -4848,6 +4848,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.getProject?4() eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.initActions?4() eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.initMenu?4(menu) +eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.initToolbar?4(ui, toolbarManager) eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.setObjects?4(vcsObject, projectObject) eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.showMenu?4() eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.shutdown?4() @@ -5161,10 +5162,11 @@ eric6.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.SvnProjectBrowserHelper.showContextMenuDirMulti?4(menu, standardItems) eric6.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.SvnProjectBrowserHelper.showContextMenuMulti?4(menu, standardItems) eric6.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.SvnProjectBrowserHelper?1(vcsObject, browserObject, projectObject, isTranslationsBrowser, parent=None, name=None) -eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.SvnProjectHelper.getActions?4() -eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.SvnProjectHelper.initActions?4() -eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.SvnProjectHelper.initMenu?4(menu) -eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.SvnProjectHelper?1(vcsObject, projectObject, parent=None, name=None) +eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.PySvnProjectHelper.getActions?4() +eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.PySvnProjectHelper.initActions?4() +eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.PySvnProjectHelper.initMenu?4(menu) +eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.PySvnProjectHelper.initToolbar?4(ui, toolbarManager) +eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.PySvnProjectHelper?1(vcsObject, projectObject, parent=None, name=None) eric6.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.SvnBlameDialog.on_buttonBox_clicked?4(button) eric6.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.SvnBlameDialog.start?4(fn) eric6.Plugins.VcsPlugins.vcsPySvn.SvnBlameDialog.SvnBlameDialog?1(vcs, parent=None) @@ -5388,6 +5390,7 @@ eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.SvnProjectHelper.getActions?4() eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.SvnProjectHelper.initActions?4() eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.SvnProjectHelper.initMenu?4(menu) +eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.SvnProjectHelper.initToolbar?4(ui, toolbarManager) eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.SvnProjectHelper?1(vcsObject, projectObject, parent=None, name=None) eric6.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.SvnBlameDialog.closeEvent?4(e) eric6.Plugins.VcsPlugins.vcsSubversion.SvnBlameDialog.SvnBlameDialog.keyPressEvent?4(evt) @@ -6571,7 +6574,7 @@ eric6.Project.Project.Project.initActions?4() eric6.Project.Project.Project.initFileTypes?4() eric6.Project.Project.Project.initMenu?4() -eric6.Project.Project.Project.initToolbar?4(toolbarManager) +eric6.Project.Project.Project.initToolbars?4(toolbarManager) eric6.Project.Project.Project.initVCS?4(vcsSystem=None, nooverride=False) eric6.Project.Project.Project.isDebugPropertiesLoaded?4() eric6.Project.Project.Project.isDirty?4() @@ -8759,7 +8762,9 @@ eric6.VCS.ProjectHelper.VcsProjectHelper._vcsTag?5() eric6.VCS.ProjectHelper.VcsProjectHelper._vcsUpdate?5() eric6.VCS.ProjectHelper.VcsProjectHelper.initActions?4() +eric6.VCS.ProjectHelper.VcsProjectHelper.initBasicToolbar?4(ui, toolbarManager) eric6.VCS.ProjectHelper.VcsProjectHelper.initMenu?4(menu) +eric6.VCS.ProjectHelper.VcsProjectHelper.initToolbar?4(ui, toolbarManager) eric6.VCS.ProjectHelper.VcsProjectHelper.revertChanges?4() eric6.VCS.ProjectHelper.VcsProjectHelper.setObjects?4(vcsObject, projectObject) eric6.VCS.ProjectHelper.VcsProjectHelper.showMenu?4() @@ -8780,6 +8785,7 @@ eric6.VCS.StatusMonitorThread.VcsStatusMonitorThread.vcsStatusMonitorData?7 eric6.VCS.StatusMonitorThread.VcsStatusMonitorThread.vcsStatusMonitorStatus?7 eric6.VCS.StatusMonitorThread.VcsStatusMonitorThread?1(interval, project, vcs, parent=None) +eric6.VCS.VcsBasicHelperSingleton?7 eric6.VCS.VersionControl.VersionControl._createStatusMonitorThread?5(interval, project) eric6.VCS.VersionControl.VersionControl.addArguments?4(args, argslist) eric6.VCS.VersionControl.VersionControl.canBeAdded?7 @@ -8843,6 +8849,7 @@ eric6.VCS.VersionControl.VersionControl.vcsUpdate?4(name, noDialog=False) eric6.VCS.VersionControl.VersionControl?1(parent=None, name=None) eric6.VCS.factory?4(vcs) +eric6.VCS.getBasicHelper?4(project) eric6.ViewManager.BookmarkedFilesDialog.BookmarkedFilesDialog.getBookmarkedFiles?4() eric6.ViewManager.BookmarkedFilesDialog.BookmarkedFilesDialog.on_addButton_clicked?4() eric6.ViewManager.BookmarkedFilesDialog.BookmarkedFilesDialog.on_changeButton_clicked?4()
--- a/APIs/Python3/eric6.bas Sun Feb 01 18:25:31 2015 +0100 +++ b/APIs/Python3/eric6.bas Sun Feb 01 18:26:32 2015 +0100 @@ -554,6 +554,7 @@ PyRegExpWizardRepeatDialog QDialog Ui_PyRegExpWizardRepeatDialog PyRegExpWizardWidget QWidget Ui_PyRegExpWizardDialog PyRegExpWizardWindow E5MainWindow +PySvnProjectHelper VcsProjectHelper PythonPage ConfigurationPageBase Ui_PythonPage QRegExpWizard QObject QRegExpWizardCharactersDialog QDialog Ui_QRegExpWizardCharactersDialog
--- a/Documentation/Help/source.qhp Sun Feb 01 18:25:31 2015 +0100 +++ b/Documentation/Help/source.qhp Sun Feb 01 18:26:32 2015 +0100 @@ -6253,6 +6253,7 @@ <keyword name="HgProjectHelper.getProject" id="HgProjectHelper.getProject" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.getProject" /> <keyword name="HgProjectHelper.initActions" id="HgProjectHelper.initActions" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.initActions" /> <keyword name="HgProjectHelper.initMenu" id="HgProjectHelper.initMenu" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.initMenu" /> + <keyword name="HgProjectHelper.initToolbar" id="HgProjectHelper.initToolbar" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.initToolbar" /> <keyword name="HgProjectHelper.setObjects" id="HgProjectHelper.setObjects" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.setObjects" /> <keyword name="HgProjectHelper.showMenu" id="HgProjectHelper.showMenu" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.showMenu" /> <keyword name="HgProjectHelper.shutdown" id="HgProjectHelper.shutdown" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.shutdown" /> @@ -8811,7 +8812,7 @@ <keyword name="Project.initActions" id="Project.initActions" ref="eric6.Project.Project.html#Project.initActions" /> <keyword name="Project.initFileTypes" id="Project.initFileTypes" ref="eric6.Project.Project.html#Project.initFileTypes" /> <keyword name="Project.initMenu" id="Project.initMenu" ref="eric6.Project.Project.html#Project.initMenu" /> - <keyword name="Project.initToolbar" id="Project.initToolbar" ref="eric6.Project.Project.html#Project.initToolbar" /> + <keyword name="Project.initToolbars" id="Project.initToolbars" ref="eric6.Project.Project.html#Project.initToolbars" /> <keyword name="Project.initVCS" id="Project.initVCS" ref="eric6.Project.Project.html#Project.initVCS" /> <keyword name="Project.isDebugPropertiesLoaded" id="Project.isDebugPropertiesLoaded" ref="eric6.Project.Project.html#Project.isDebugPropertiesLoaded" /> <keyword name="Project.isDirty" id="Project.isDirty" ref="eric6.Project.Project.html#Project.isDirty" /> @@ -9328,6 +9329,26 @@ <keyword name="PyRegExpWizardWindow" id="PyRegExpWizardWindow" ref="eric6.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.html#PyRegExpWizardWindow" /> <keyword name="PyRegExpWizardWindow (Constructor)" id="PyRegExpWizardWindow (Constructor)" ref="eric6.Plugins.WizardPlugins.PyRegExpWizard.PyRegExpWizardDialog.html#PyRegExpWizardWindow.__init__" /> <keyword name="PySideImporter (Module)" id="PySideImporter (Module)" ref="eric6.Utilities.PySideImporter.html" /> + <keyword name="PySvnProjectHelper" id="PySvnProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper" /> + <keyword name="PySvnProjectHelper (Constructor)" id="PySvnProjectHelper (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__init__" /> + <keyword name="PySvnProjectHelper.__svnBranchList" id="PySvnProjectHelper.__svnBranchList" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__svnBranchList" /> + <keyword name="PySvnProjectHelper.__svnChangeLists" id="PySvnProjectHelper.__svnChangeLists" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__svnChangeLists" /> + <keyword name="PySvnProjectHelper.__svnConfigure" id="PySvnProjectHelper.__svnConfigure" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__svnConfigure" /> + <keyword name="PySvnProjectHelper.__svnExtendedDiff" id="PySvnProjectHelper.__svnExtendedDiff" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__svnExtendedDiff" /> + <keyword name="PySvnProjectHelper.__svnInfo" id="PySvnProjectHelper.__svnInfo" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__svnInfo" /> + <keyword name="PySvnProjectHelper.__svnPropDel" id="PySvnProjectHelper.__svnPropDel" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__svnPropDel" /> + <keyword name="PySvnProjectHelper.__svnPropList" id="PySvnProjectHelper.__svnPropList" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__svnPropList" /> + <keyword name="PySvnProjectHelper.__svnPropSet" id="PySvnProjectHelper.__svnPropSet" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__svnPropSet" /> + <keyword name="PySvnProjectHelper.__svnRelocate" id="PySvnProjectHelper.__svnRelocate" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__svnRelocate" /> + <keyword name="PySvnProjectHelper.__svnRepoBrowser" id="PySvnProjectHelper.__svnRepoBrowser" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__svnRepoBrowser" /> + <keyword name="PySvnProjectHelper.__svnResolve" id="PySvnProjectHelper.__svnResolve" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__svnResolve" /> + <keyword name="PySvnProjectHelper.__svnTagList" id="PySvnProjectHelper.__svnTagList" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__svnTagList" /> + <keyword name="PySvnProjectHelper.__svnUpgrade" id="PySvnProjectHelper.__svnUpgrade" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__svnUpgrade" /> + <keyword name="PySvnProjectHelper.__svnUrlDiff" id="PySvnProjectHelper.__svnUrlDiff" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.__svnUrlDiff" /> + <keyword name="PySvnProjectHelper.getActions" id="PySvnProjectHelper.getActions" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.getActions" /> + <keyword name="PySvnProjectHelper.initActions" id="PySvnProjectHelper.initActions" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.initActions" /> + <keyword name="PySvnProjectHelper.initMenu" id="PySvnProjectHelper.initMenu" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.initMenu" /> + <keyword name="PySvnProjectHelper.initToolbar" id="PySvnProjectHelper.initToolbar" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.initToolbar" /> <keyword name="PyUnit (Package)" id="PyUnit (Package)" ref="index-eric6.PyUnit.html" /> <keyword name="Python (Package)" id="Python (Package)" ref="index-eric6.DebugClients.Python.html" /> <keyword name="Python3 (Package)" id="Python3 (Package)" ref="index-eric6.DebugClients.Python3.html" /> @@ -10918,43 +10939,25 @@ <keyword name="SvnProjectBrowserHelper.showContextMenuDirMulti" id="SvnProjectBrowserHelper.showContextMenuDirMulti" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.showContextMenuDirMulti" /> <keyword name="SvnProjectBrowserHelper.showContextMenuMulti" id="SvnProjectBrowserHelper.showContextMenuMulti" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.showContextMenuMulti" /> <keyword name="SvnProjectBrowserHelper.showContextMenuMulti" id="SvnProjectBrowserHelper.showContextMenuMulti" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.showContextMenuMulti" /> - <keyword name="SvnProjectHelper" id="SvnProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper" /> <keyword name="SvnProjectHelper" id="SvnProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper" /> - <keyword name="SvnProjectHelper (Constructor)" id="SvnProjectHelper (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__init__" /> <keyword name="SvnProjectHelper (Constructor)" id="SvnProjectHelper (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__init__" /> - <keyword name="SvnProjectHelper.__svnBranchList" id="SvnProjectHelper.__svnBranchList" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnBranchList" /> <keyword name="SvnProjectHelper.__svnBranchList" id="SvnProjectHelper.__svnBranchList" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnBranchList" /> - <keyword name="SvnProjectHelper.__svnChangeLists" id="SvnProjectHelper.__svnChangeLists" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnChangeLists" /> <keyword name="SvnProjectHelper.__svnChangeLists" id="SvnProjectHelper.__svnChangeLists" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnChangeLists" /> - <keyword name="SvnProjectHelper.__svnConfigure" id="SvnProjectHelper.__svnConfigure" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnConfigure" /> <keyword name="SvnProjectHelper.__svnConfigure" id="SvnProjectHelper.__svnConfigure" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnConfigure" /> - <keyword name="SvnProjectHelper.__svnExtendedDiff" id="SvnProjectHelper.__svnExtendedDiff" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnExtendedDiff" /> <keyword name="SvnProjectHelper.__svnExtendedDiff" id="SvnProjectHelper.__svnExtendedDiff" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnExtendedDiff" /> - <keyword name="SvnProjectHelper.__svnInfo" id="SvnProjectHelper.__svnInfo" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnInfo" /> - <keyword name="SvnProjectHelper.__svnPropDel" id="SvnProjectHelper.__svnPropDel" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnPropDel" /> <keyword name="SvnProjectHelper.__svnPropDel" id="SvnProjectHelper.__svnPropDel" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnPropDel" /> - <keyword name="SvnProjectHelper.__svnPropList" id="SvnProjectHelper.__svnPropList" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnPropList" /> <keyword name="SvnProjectHelper.__svnPropList" id="SvnProjectHelper.__svnPropList" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnPropList" /> - <keyword name="SvnProjectHelper.__svnPropSet" id="SvnProjectHelper.__svnPropSet" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnPropSet" /> <keyword name="SvnProjectHelper.__svnPropSet" id="SvnProjectHelper.__svnPropSet" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnPropSet" /> - <keyword name="SvnProjectHelper.__svnRelocate" id="SvnProjectHelper.__svnRelocate" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnRelocate" /> <keyword name="SvnProjectHelper.__svnRelocate" id="SvnProjectHelper.__svnRelocate" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnRelocate" /> - <keyword name="SvnProjectHelper.__svnRepoBrowser" id="SvnProjectHelper.__svnRepoBrowser" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnRepoBrowser" /> <keyword name="SvnProjectHelper.__svnRepoBrowser" id="SvnProjectHelper.__svnRepoBrowser" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnRepoBrowser" /> - <keyword name="SvnProjectHelper.__svnResolve" id="SvnProjectHelper.__svnResolve" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnResolve" /> <keyword name="SvnProjectHelper.__svnResolve" id="SvnProjectHelper.__svnResolve" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnResolve" /> - <keyword name="SvnProjectHelper.__svnTagList" id="SvnProjectHelper.__svnTagList" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnTagList" /> <keyword name="SvnProjectHelper.__svnTagList" id="SvnProjectHelper.__svnTagList" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnTagList" /> - <keyword name="SvnProjectHelper.__svnUpgrade" id="SvnProjectHelper.__svnUpgrade" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnUpgrade" /> <keyword name="SvnProjectHelper.__svnUpgrade" id="SvnProjectHelper.__svnUpgrade" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnUpgrade" /> - <keyword name="SvnProjectHelper.__svnUrlDiff" id="SvnProjectHelper.__svnUrlDiff" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnUrlDiff" /> <keyword name="SvnProjectHelper.__svnUrlDiff" id="SvnProjectHelper.__svnUrlDiff" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnUrlDiff" /> - <keyword name="SvnProjectHelper.getActions" id="SvnProjectHelper.getActions" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.getActions" /> <keyword name="SvnProjectHelper.getActions" id="SvnProjectHelper.getActions" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.getActions" /> - <keyword name="SvnProjectHelper.initActions" id="SvnProjectHelper.initActions" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.initActions" /> <keyword name="SvnProjectHelper.initActions" id="SvnProjectHelper.initActions" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.initActions" /> - <keyword name="SvnProjectHelper.initMenu" id="SvnProjectHelper.initMenu" ref="eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.initMenu" /> <keyword name="SvnProjectHelper.initMenu" id="SvnProjectHelper.initMenu" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.initMenu" /> + <keyword name="SvnProjectHelper.initToolbar" id="SvnProjectHelper.initToolbar" ref="eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.initToolbar" /> <keyword name="SvnPropDelDialog" id="SvnPropDelDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnPropDelDialog.html#SvnPropDelDialog" /> <keyword name="SvnPropDelDialog (Constructor)" id="SvnPropDelDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnPropDelDialog.html#SvnPropDelDialog.__init__" /> <keyword name="SvnPropDelDialog (Module)" id="SvnPropDelDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnPropDelDialog.html" /> @@ -12328,7 +12331,9 @@ <keyword name="VcsProjectHelper._vcsTag" id="VcsProjectHelper._vcsTag" ref="eric6.VCS.ProjectHelper.html#VcsProjectHelper._vcsTag" /> <keyword name="VcsProjectHelper._vcsUpdate" id="VcsProjectHelper._vcsUpdate" ref="eric6.VCS.ProjectHelper.html#VcsProjectHelper._vcsUpdate" /> <keyword name="VcsProjectHelper.initActions" id="VcsProjectHelper.initActions" ref="eric6.VCS.ProjectHelper.html#VcsProjectHelper.initActions" /> + <keyword name="VcsProjectHelper.initBasicToolbar" id="VcsProjectHelper.initBasicToolbar" ref="eric6.VCS.ProjectHelper.html#VcsProjectHelper.initBasicToolbar" /> <keyword name="VcsProjectHelper.initMenu" id="VcsProjectHelper.initMenu" ref="eric6.VCS.ProjectHelper.html#VcsProjectHelper.initMenu" /> + <keyword name="VcsProjectHelper.initToolbar" id="VcsProjectHelper.initToolbar" ref="eric6.VCS.ProjectHelper.html#VcsProjectHelper.initToolbar" /> <keyword name="VcsProjectHelper.revertChanges" id="VcsProjectHelper.revertChanges" ref="eric6.VCS.ProjectHelper.html#VcsProjectHelper.revertChanges" /> <keyword name="VcsProjectHelper.setObjects" id="VcsProjectHelper.setObjects" ref="eric6.VCS.ProjectHelper.html#VcsProjectHelper.setObjects" /> <keyword name="VcsProjectHelper.showMenu" id="VcsProjectHelper.showMenu" ref="eric6.VCS.ProjectHelper.html#VcsProjectHelper.showMenu" /> @@ -13146,6 +13151,7 @@ <keyword name="generatePySideToolPath" id="generatePySideToolPath" ref="eric6.Utilities.__init__.html#generatePySideToolPath" /> <keyword name="generateQtToolName" id="generateQtToolName" ref="eric6.Utilities.__init__.html#generateQtToolName" /> <keyword name="generateVersionInfo" id="generateVersionInfo" ref="eric6.Utilities.__init__.html#generateVersionInfo" /> + <keyword name="getBasicHelper" id="getBasicHelper" ref="eric6.VCS.__init__.html#getBasicHelper" /> <keyword name="getChannelModesDict" id="getChannelModesDict" ref="eric6.Network.IRC.IrcUtilities.html#getChannelModesDict" /> <keyword name="getCombinedIcon" id="getCombinedIcon" ref="eric6.UI.PixmapCache.html#getCombinedIcon" /> <keyword name="getCompleter" id="getCompleter" ref="eric6.QScintilla.TypingCompleters.__init__.html#getCompleter" />
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sun Feb 01 18:25:31 2015 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sun Feb 01 18:26:32 2015 +0100 @@ -768,7 +768,12 @@ <b>on_modeComboBox_currentIndexChanged</b>(<i>index</i>) <p> Private slot to react on mode changes. -</p><a NAME="HgLogBrowserDialog.on_nextButton_clicked" ID="HgLogBrowserDialog.on_nextButton_clicked"></a> +</p><dl> +<dt><i>index</i></dt> +<dd> +index of the selected entry (integer) +</dd> +</dl><a NAME="HgLogBrowserDialog.on_nextButton_clicked" ID="HgLogBrowserDialog.on_nextButton_clicked"></a> <h4>HgLogBrowserDialog.on_nextButton_clicked</h4> <b>on_nextButton_clicked</b>(<i></i>) <p>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Sun Feb 01 18:25:31 2015 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Sun Feb 01 18:26:32 2015 +0100 @@ -252,6 +252,9 @@ <td><a href="#HgProjectHelper.initMenu">initMenu</a></td> <td>Public method to generate the VCS menu.</td> </tr><tr> +<td><a href="#HgProjectHelper.initToolbar">initToolbar</a></td> +<td>Public slot to initialize the VCS toolbar.</td> +</tr><tr> <td><a href="#HgProjectHelper.setObjects">setObjects</a></td> <td>Public method to set references to the vcs and project objects.</td> </tr><tr> @@ -626,6 +629,25 @@ <dd> reference to the menu to be populated (QMenu) </dd> +</dl><a NAME="HgProjectHelper.initToolbar" ID="HgProjectHelper.initToolbar"></a> +<h4>HgProjectHelper.initToolbar</h4> +<b>initToolbar</b>(<i>ui, toolbarManager</i>) +<p> + Public slot to initialize the VCS toolbar. +</p><dl> +<dt><i>ui</i></dt> +<dd> +reference to the main window (UserInterface) +</dd><dt><i>toolbarManager</i></dt> +<dd> +reference to a toolbar manager object + (E5ToolBarManager) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +the toolbar generated (QToolBar) +</dd> </dl><a NAME="HgProjectHelper.setObjects" ID="HgProjectHelper.setObjects"></a> <h4>HgProjectHelper.setObjects</h4> <b>setObjects</b>(<i>vcsObject, projectObject</i>)
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html Sun Feb 01 18:25:31 2015 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html Sun Feb 01 18:26:32 2015 +0100 @@ -30,7 +30,7 @@ <h3>Classes</h3> <table> <tr> -<td><a href="#SvnProjectHelper">SvnProjectHelper</a></td> +<td><a href="#PySvnProjectHelper">PySvnProjectHelper</a></td> <td>Class implementing the VCS project helper for Subversion.</td> </tr> </table> @@ -39,8 +39,8 @@ <tr><td>None</td></tr> </table> <hr /><hr /> -<a NAME="SvnProjectHelper" ID="SvnProjectHelper"></a> -<h2>SvnProjectHelper</h2> +<a NAME="PySvnProjectHelper" ID="PySvnProjectHelper"></a> +<h2>PySvnProjectHelper</h2> <p> Class implementing the VCS project helper for Subversion. </p> @@ -57,68 +57,71 @@ <h3>Methods</h3> <table> <tr> -<td><a href="#SvnProjectHelper.__init__">SvnProjectHelper</a></td> +<td><a href="#PySvnProjectHelper.__init__">PySvnProjectHelper</a></td> <td>Constructor</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnBranchList">__svnBranchList</a></td> +<td><a href="#PySvnProjectHelper.__svnBranchList">__svnBranchList</a></td> <td>Private slot used to list the branches of the project.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnChangeLists">__svnChangeLists</a></td> +<td><a href="#PySvnProjectHelper.__svnChangeLists">__svnChangeLists</a></td> <td>Private slot used to show a list of change lists.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnConfigure">__svnConfigure</a></td> +<td><a href="#PySvnProjectHelper.__svnConfigure">__svnConfigure</a></td> <td>Private slot to open the configuration dialog.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnExtendedDiff">__svnExtendedDiff</a></td> +<td><a href="#PySvnProjectHelper.__svnExtendedDiff">__svnExtendedDiff</a></td> <td>Private slot used to perform a svn diff with the selection of revisions.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnInfo">__svnInfo</a></td> +<td><a href="#PySvnProjectHelper.__svnInfo">__svnInfo</a></td> <td>Private slot used to show repository information for the local project.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnPropDel">__svnPropDel</a></td> +<td><a href="#PySvnProjectHelper.__svnPropDel">__svnPropDel</a></td> <td>Private slot used to delete a property for the project files.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnPropList">__svnPropList</a></td> +<td><a href="#PySvnProjectHelper.__svnPropList">__svnPropList</a></td> <td>Private slot used to list the properties of the project files.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnPropSet">__svnPropSet</a></td> +<td><a href="#PySvnProjectHelper.__svnPropSet">__svnPropSet</a></td> <td>Private slot used to set a property for the project files.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnRelocate">__svnRelocate</a></td> +<td><a href="#PySvnProjectHelper.__svnRelocate">__svnRelocate</a></td> <td>Private slot used to relocate the working copy to a new repository URL.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnRepoBrowser">__svnRepoBrowser</a></td> +<td><a href="#PySvnProjectHelper.__svnRepoBrowser">__svnRepoBrowser</a></td> <td>Private slot to open the repository browser.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnResolve">__svnResolve</a></td> +<td><a href="#PySvnProjectHelper.__svnResolve">__svnResolve</a></td> <td>Private slot used to resolve conflicts of the local project.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnTagList">__svnTagList</a></td> +<td><a href="#PySvnProjectHelper.__svnTagList">__svnTagList</a></td> <td>Private slot used to list the tags of the project.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnUpgrade">__svnUpgrade</a></td> +<td><a href="#PySvnProjectHelper.__svnUpgrade">__svnUpgrade</a></td> <td>Private slot used to upgrade the working copy format.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnUrlDiff">__svnUrlDiff</a></td> +<td><a href="#PySvnProjectHelper.__svnUrlDiff">__svnUrlDiff</a></td> <td>Private slot used to perform a svn diff with the selection of repository URLs.</td> </tr><tr> -<td><a href="#SvnProjectHelper.getActions">getActions</a></td> +<td><a href="#PySvnProjectHelper.getActions">getActions</a></td> <td>Public method to get a list of all actions.</td> </tr><tr> -<td><a href="#SvnProjectHelper.initActions">initActions</a></td> +<td><a href="#PySvnProjectHelper.initActions">initActions</a></td> <td>Public method to generate the action objects.</td> </tr><tr> -<td><a href="#SvnProjectHelper.initMenu">initMenu</a></td> +<td><a href="#PySvnProjectHelper.initMenu">initMenu</a></td> <td>Public method to generate the VCS menu.</td> +</tr><tr> +<td><a href="#PySvnProjectHelper.initToolbar">initToolbar</a></td> +<td>Public slot to initialize the VCS toolbar.</td> </tr> </table> <h3>Static Methods</h3> <table> <tr><td>None</td></tr> </table> -<a NAME="SvnProjectHelper.__init__" ID="SvnProjectHelper.__init__"></a> -<h4>SvnProjectHelper (Constructor)</h4> -<b>SvnProjectHelper</b>(<i>vcsObject, projectObject, parent=None, name=None</i>) +<a NAME="PySvnProjectHelper.__init__" ID="PySvnProjectHelper.__init__"></a> +<h4>PySvnProjectHelper (Constructor)</h4> +<b>PySvnProjectHelper</b>(<i>vcsObject, projectObject, parent=None, name=None</i>) <p> Constructor </p><dl> @@ -135,80 +138,80 @@ <dd> name of this object (string) </dd> -</dl><a NAME="SvnProjectHelper.__svnBranchList" ID="SvnProjectHelper.__svnBranchList"></a> -<h4>SvnProjectHelper.__svnBranchList</h4> +</dl><a NAME="PySvnProjectHelper.__svnBranchList" ID="PySvnProjectHelper.__svnBranchList"></a> +<h4>PySvnProjectHelper.__svnBranchList</h4> <b>__svnBranchList</b>(<i></i>) <p> Private slot used to list the branches of the project. -</p><a NAME="SvnProjectHelper.__svnChangeLists" ID="SvnProjectHelper.__svnChangeLists"></a> -<h4>SvnProjectHelper.__svnChangeLists</h4> +</p><a NAME="PySvnProjectHelper.__svnChangeLists" ID="PySvnProjectHelper.__svnChangeLists"></a> +<h4>PySvnProjectHelper.__svnChangeLists</h4> <b>__svnChangeLists</b>(<i></i>) <p> Private slot used to show a list of change lists. -</p><a NAME="SvnProjectHelper.__svnConfigure" ID="SvnProjectHelper.__svnConfigure"></a> -<h4>SvnProjectHelper.__svnConfigure</h4> +</p><a NAME="PySvnProjectHelper.__svnConfigure" ID="PySvnProjectHelper.__svnConfigure"></a> +<h4>PySvnProjectHelper.__svnConfigure</h4> <b>__svnConfigure</b>(<i></i>) <p> Private slot to open the configuration dialog. -</p><a NAME="SvnProjectHelper.__svnExtendedDiff" ID="SvnProjectHelper.__svnExtendedDiff"></a> -<h4>SvnProjectHelper.__svnExtendedDiff</h4> +</p><a NAME="PySvnProjectHelper.__svnExtendedDiff" ID="PySvnProjectHelper.__svnExtendedDiff"></a> +<h4>PySvnProjectHelper.__svnExtendedDiff</h4> <b>__svnExtendedDiff</b>(<i></i>) <p> Private slot used to perform a svn diff with the selection of revisions. -</p><a NAME="SvnProjectHelper.__svnInfo" ID="SvnProjectHelper.__svnInfo"></a> -<h4>SvnProjectHelper.__svnInfo</h4> +</p><a NAME="PySvnProjectHelper.__svnInfo" ID="PySvnProjectHelper.__svnInfo"></a> +<h4>PySvnProjectHelper.__svnInfo</h4> <b>__svnInfo</b>(<i></i>) <p> Private slot used to show repository information for the local project. -</p><a NAME="SvnProjectHelper.__svnPropDel" ID="SvnProjectHelper.__svnPropDel"></a> -<h4>SvnProjectHelper.__svnPropDel</h4> +</p><a NAME="PySvnProjectHelper.__svnPropDel" ID="PySvnProjectHelper.__svnPropDel"></a> +<h4>PySvnProjectHelper.__svnPropDel</h4> <b>__svnPropDel</b>(<i></i>) <p> Private slot used to delete a property for the project files. -</p><a NAME="SvnProjectHelper.__svnPropList" ID="SvnProjectHelper.__svnPropList"></a> -<h4>SvnProjectHelper.__svnPropList</h4> +</p><a NAME="PySvnProjectHelper.__svnPropList" ID="PySvnProjectHelper.__svnPropList"></a> +<h4>PySvnProjectHelper.__svnPropList</h4> <b>__svnPropList</b>(<i></i>) <p> Private slot used to list the properties of the project files. -</p><a NAME="SvnProjectHelper.__svnPropSet" ID="SvnProjectHelper.__svnPropSet"></a> -<h4>SvnProjectHelper.__svnPropSet</h4> +</p><a NAME="PySvnProjectHelper.__svnPropSet" ID="PySvnProjectHelper.__svnPropSet"></a> +<h4>PySvnProjectHelper.__svnPropSet</h4> <b>__svnPropSet</b>(<i></i>) <p> Private slot used to set a property for the project files. -</p><a NAME="SvnProjectHelper.__svnRelocate" ID="SvnProjectHelper.__svnRelocate"></a> -<h4>SvnProjectHelper.__svnRelocate</h4> +</p><a NAME="PySvnProjectHelper.__svnRelocate" ID="PySvnProjectHelper.__svnRelocate"></a> +<h4>PySvnProjectHelper.__svnRelocate</h4> <b>__svnRelocate</b>(<i></i>) <p> Private slot used to relocate the working copy to a new repository URL. -</p><a NAME="SvnProjectHelper.__svnRepoBrowser" ID="SvnProjectHelper.__svnRepoBrowser"></a> -<h4>SvnProjectHelper.__svnRepoBrowser</h4> +</p><a NAME="PySvnProjectHelper.__svnRepoBrowser" ID="PySvnProjectHelper.__svnRepoBrowser"></a> +<h4>PySvnProjectHelper.__svnRepoBrowser</h4> <b>__svnRepoBrowser</b>(<i></i>) <p> Private slot to open the repository browser. -</p><a NAME="SvnProjectHelper.__svnResolve" ID="SvnProjectHelper.__svnResolve"></a> -<h4>SvnProjectHelper.__svnResolve</h4> +</p><a NAME="PySvnProjectHelper.__svnResolve" ID="PySvnProjectHelper.__svnResolve"></a> +<h4>PySvnProjectHelper.__svnResolve</h4> <b>__svnResolve</b>(<i></i>) <p> Private slot used to resolve conflicts of the local project. -</p><a NAME="SvnProjectHelper.__svnTagList" ID="SvnProjectHelper.__svnTagList"></a> -<h4>SvnProjectHelper.__svnTagList</h4> +</p><a NAME="PySvnProjectHelper.__svnTagList" ID="PySvnProjectHelper.__svnTagList"></a> +<h4>PySvnProjectHelper.__svnTagList</h4> <b>__svnTagList</b>(<i></i>) <p> Private slot used to list the tags of the project. -</p><a NAME="SvnProjectHelper.__svnUpgrade" ID="SvnProjectHelper.__svnUpgrade"></a> -<h4>SvnProjectHelper.__svnUpgrade</h4> +</p><a NAME="PySvnProjectHelper.__svnUpgrade" ID="PySvnProjectHelper.__svnUpgrade"></a> +<h4>PySvnProjectHelper.__svnUpgrade</h4> <b>__svnUpgrade</b>(<i></i>) <p> Private slot used to upgrade the working copy format. -</p><a NAME="SvnProjectHelper.__svnUrlDiff" ID="SvnProjectHelper.__svnUrlDiff"></a> -<h4>SvnProjectHelper.__svnUrlDiff</h4> +</p><a NAME="PySvnProjectHelper.__svnUrlDiff" ID="PySvnProjectHelper.__svnUrlDiff"></a> +<h4>PySvnProjectHelper.__svnUrlDiff</h4> <b>__svnUrlDiff</b>(<i></i>) <p> Private slot used to perform a svn diff with the selection of repository URLs. -</p><a NAME="SvnProjectHelper.getActions" ID="SvnProjectHelper.getActions"></a> -<h4>SvnProjectHelper.getActions</h4> +</p><a NAME="PySvnProjectHelper.getActions" ID="PySvnProjectHelper.getActions"></a> +<h4>PySvnProjectHelper.getActions</h4> <b>getActions</b>(<i></i>) <p> Public method to get a list of all actions. @@ -217,13 +220,13 @@ <dd> list of all actions (list of E5Action) </dd> -</dl><a NAME="SvnProjectHelper.initActions" ID="SvnProjectHelper.initActions"></a> -<h4>SvnProjectHelper.initActions</h4> +</dl><a NAME="PySvnProjectHelper.initActions" ID="PySvnProjectHelper.initActions"></a> +<h4>PySvnProjectHelper.initActions</h4> <b>initActions</b>(<i></i>) <p> Public method to generate the action objects. -</p><a NAME="SvnProjectHelper.initMenu" ID="SvnProjectHelper.initMenu"></a> -<h4>SvnProjectHelper.initMenu</h4> +</p><a NAME="PySvnProjectHelper.initMenu" ID="PySvnProjectHelper.initMenu"></a> +<h4>PySvnProjectHelper.initMenu</h4> <b>initMenu</b>(<i>menu</i>) <p> Public method to generate the VCS menu. @@ -232,6 +235,25 @@ <dd> reference to the menu to be populated (QMenu) </dd> +</dl><a NAME="PySvnProjectHelper.initToolbar" ID="PySvnProjectHelper.initToolbar"></a> +<h4>PySvnProjectHelper.initToolbar</h4> +<b>initToolbar</b>(<i>ui, toolbarManager</i>) +<p> + Public slot to initialize the VCS toolbar. +</p><dl> +<dt><i>ui</i></dt> +<dd> +reference to the main window (UserInterface) +</dd><dt><i>toolbarManager</i></dt> +<dd> +reference to a toolbar manager object + (E5ToolBarManager) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +the toolbar generated (QToolBar) +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html Sun Feb 01 18:25:31 2015 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html Sun Feb 01 18:26:32 2015 +0100 @@ -107,6 +107,9 @@ </tr><tr> <td><a href="#SvnProjectHelper.initMenu">initMenu</a></td> <td>Public method to generate the VCS menu.</td> +</tr><tr> +<td><a href="#SvnProjectHelper.initToolbar">initToolbar</a></td> +<td>Public slot to initialize the VCS toolbar.</td> </tr> </table> <h3>Static Methods</h3> @@ -224,6 +227,25 @@ <dd> reference to the menu to be populated (QMenu) </dd> +</dl><a NAME="SvnProjectHelper.initToolbar" ID="SvnProjectHelper.initToolbar"></a> +<h4>SvnProjectHelper.initToolbar</h4> +<b>initToolbar</b>(<i>ui, toolbarManager</i>) +<p> + Public slot to initialize the VCS toolbar. +</p><dl> +<dt><i>ui</i></dt> +<dd> +reference to the main window (UserInterface) +</dd><dt><i>toolbarManager</i></dt> +<dd> +reference to a toolbar manager object + (E5ToolBarManager) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +the toolbar generated (QToolBar) +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric6.Project.Project.html Sun Feb 01 18:25:31 2015 +0100 +++ b/Documentation/Source/eric6.Project.Project.html Sun Feb 01 18:26:32 2015 +0100 @@ -542,8 +542,8 @@ <td><a href="#Project.initMenu">initMenu</a></td> <td>Public slot to initialize the project menu.</td> </tr><tr> -<td><a href="#Project.initToolbar">initToolbar</a></td> -<td>Public slot to initialize the project toolbar.</td> +<td><a href="#Project.initToolbars">initToolbars</a></td> +<td>Public slot to initialize the project toolbar and the basic VCS toolbar.</td> </tr><tr> <td><a href="#Project.initVCS">initVCS</a></td> <td>Public method used to instantiate a vcs system.</td> @@ -1877,11 +1877,12 @@ <dd> the menu generated (QMenu) </dd> -</dl><a NAME="Project.initToolbar" ID="Project.initToolbar"></a> -<h4>Project.initToolbar</h4> -<b>initToolbar</b>(<i>toolbarManager</i>) +</dl><a NAME="Project.initToolbars" ID="Project.initToolbars"></a> +<h4>Project.initToolbars</h4> +<b>initToolbars</b>(<i>toolbarManager</i>) <p> - Public slot to initialize the project toolbar. + Public slot to initialize the project toolbar and the basic VCS + toolbar. </p><dl> <dt><i>toolbarManager</i></dt> <dd> @@ -1891,7 +1892,7 @@ </dl><dl> <dt>Returns:</dt> <dd> -the toolbar generated (QToolBar) +tuple of the generated toolbars (tuple of two QToolBar) </dd> </dl><a NAME="Project.initVCS" ID="Project.initVCS"></a> <h4>Project.initVCS</h4>
--- a/Documentation/Source/eric6.VCS.ProjectHelper.html Sun Feb 01 18:25:31 2015 +0100 +++ b/Documentation/Source/eric6.VCS.ProjectHelper.html Sun Feb 01 18:26:32 2015 +0100 @@ -117,9 +117,15 @@ <td><a href="#VcsProjectHelper.initActions">initActions</a></td> <td>Public method to generate the action objects.</td> </tr><tr> +<td><a href="#VcsProjectHelper.initBasicToolbar">initBasicToolbar</a></td> +<td>Public slot to initialize the basic VCS toolbar.</td> +</tr><tr> <td><a href="#VcsProjectHelper.initMenu">initMenu</a></td> <td>Public method to generate the VCS menu.</td> </tr><tr> +<td><a href="#VcsProjectHelper.initToolbar">initToolbar</a></td> +<td>Public slot to initialize the VCS toolbar.</td> +</tr><tr> <td><a href="#VcsProjectHelper.revertChanges">revertChanges</a></td> <td>Local function to revert the changes made to the project object.</td> </tr><tr> @@ -266,7 +272,26 @@ <b>initActions</b>(<i></i>) <p> Public method to generate the action objects. -</p><a NAME="VcsProjectHelper.initMenu" ID="VcsProjectHelper.initMenu"></a> +</p><a NAME="VcsProjectHelper.initBasicToolbar" ID="VcsProjectHelper.initBasicToolbar"></a> +<h4>VcsProjectHelper.initBasicToolbar</h4> +<b>initBasicToolbar</b>(<i>ui, toolbarManager</i>) +<p> + Public slot to initialize the basic VCS toolbar. +</p><dl> +<dt><i>ui</i></dt> +<dd> +reference to the main window (UserInterface) +</dd><dt><i>toolbarManager</i></dt> +<dd> +reference to a toolbar manager object + (E5ToolBarManager) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +the toolbar generated (QToolBar) +</dd> +</dl><a NAME="VcsProjectHelper.initMenu" ID="VcsProjectHelper.initMenu"></a> <h4>VcsProjectHelper.initMenu</h4> <b>initMenu</b>(<i>menu</i>) <p> @@ -276,6 +301,25 @@ <dd> reference to the menu to be populated (QMenu) </dd> +</dl><a NAME="VcsProjectHelper.initToolbar" ID="VcsProjectHelper.initToolbar"></a> +<h4>VcsProjectHelper.initToolbar</h4> +<b>initToolbar</b>(<i>ui, toolbarManager</i>) +<p> + Public slot to initialize the VCS toolbar. +</p><dl> +<dt><i>ui</i></dt> +<dd> +reference to the main window (UserInterface) +</dd><dt><i>toolbarManager</i></dt> +<dd> +reference to a toolbar manager object + (E5ToolBarManager) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +the toolbar generated (QToolBar) +</dd> </dl><a NAME="VcsProjectHelper.revertChanges" ID="VcsProjectHelper.revertChanges"></a> <h4>VcsProjectHelper.revertChanges</h4> <b>revertChanges</b>(<i></i>)
--- a/Documentation/Source/eric6.VCS.__init__.html Sun Feb 01 18:25:31 2015 +0100 +++ b/Documentation/Source/eric6.VCS.__init__.html Sun Feb 01 18:26:32 2015 +0100 @@ -31,7 +31,7 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>VcsBasicHelperSingleton</td></tr> </table> <h3>Classes</h3> <table> @@ -42,6 +42,9 @@ <tr> <td><a href="#factory">factory</a></td> <td>Modul factory function to generate the right vcs object.</td> +</tr><tr> +<td><a href="#getBasicHelper">getBasicHelper</a></td> +<td>Module function to get a reference to the basic project helper singleton.</td> </tr> </table> <hr /><hr /> @@ -62,5 +65,24 @@ </dd> </dl> <div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="getBasicHelper" ID="getBasicHelper"></a> +<h2>getBasicHelper</h2> +<b>getBasicHelper</b>(<i>project</i>) +<p> + Module function to get a reference to the basic project helper singleton. +</p><dl> +<dt><i>project</i></dt> +<dd> +reference to the project object (Project) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the basic VCS project helper singleton + (VcsProjectHelper) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file