Sun, 09 Mar 2014 17:06:40 +0100
Made the status LED (right lower corner) clickable (depending on overall VCS status it will show the log browser or the status dialog).
--- a/APIs/Python3/eric5.api Sun Mar 09 12:16:00 2014 +0100 +++ b/APIs/Python3/eric5.api Sun Mar 09 17:06:40 2014 +0100 @@ -1234,6 +1234,10 @@ eric5.E5Gui.E5FileDialog.getOpenFileNamesAndFilter?4(parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options()) eric5.E5Gui.E5FileDialog.getSaveFileName?4(parent=None, caption="", directory="", filter="", options=QFileDialog.Options()) eric5.E5Gui.E5FileDialog.getSaveFileNameAndFilter?4(parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options()) +eric5.E5Gui.E5Led.E5ClickableLed.clicked?7 +eric5.E5Gui.E5Led.E5ClickableLed.middleClicked?7 +eric5.E5Gui.E5Led.E5ClickableLed.mouseReleaseEvent?4(evt) +eric5.E5Gui.E5Led.E5ClickableLed?1(parent=None, color=None, shape=E5LedCircular, rectRatio=1) eric5.E5Gui.E5Led.E5Led.color?4() eric5.E5Gui.E5Led.E5Led.darkFactor?4() eric5.E5Gui.E5Led.E5Led.isFramed?4() @@ -4997,7 +5001,6 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIncoming?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgInfo?4(ppath, mode="heads") eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgListTagBranch?4(path, tags=True) -eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgLogBrowser?4(path, isFile=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgNormalizeURL?4(url) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgOutgoing?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPhase?4(name, data=None) @@ -5037,6 +5040,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsInit?4(vcsDir, noDialog=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsInitConfig?4(project) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsLog?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsLogBrowser?4(name, isFile=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMerge?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMove?4(name, project, target=None, noDialog=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsName?4() @@ -5230,7 +5234,6 @@ eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnListProps?4(name, recursive=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnListTagBranch?4(path, tags=True) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnLock?4(name, stealIt=False, parent=None) -eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnLogBrowser?4(path, isFile=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnNormalizeURL?4(url) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnRelocate?4(projectPath) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnRemoveFromChangelist?4(names) @@ -5260,6 +5263,7 @@ eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsInit?4(vcsDir, noDialog=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsInitConfig?4(project) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsLog?4(name) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsLogBrowser?4(name, isFile=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsMerge?4(name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsMove?4(name, project, target=None, noDialog=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsName?4() @@ -5472,7 +5476,6 @@ eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnListProps?4(name, recursive=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnListTagBranch?4(path, tags=True) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnLock?4(name, stealIt=False, parent=None) -eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnLogBrowser?4(path, isFile=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnNormalizeURL?4(url) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnRelocate?4(projectPath) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnRemoveFromChangelist?4(names) @@ -5502,6 +5505,7 @@ eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsInit?4(vcsDir, noDialog=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsInitConfig?4(project) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsLog?4(name) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsLogBrowser?4(name, isFile=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsMerge?4(name) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsMove?4(name, project, target=None, noDialog=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsName?4() @@ -8926,6 +8930,7 @@ eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper._VCSDiff?5() eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper._VCSInfoDisplay?5() eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper._VCSLog?5() +eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper._VCSLogBrowser?5() eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper._VCSMerge?5() eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper._VCSRemove?5() eric5.VCS.ProjectBrowserHelper.VcsProjectBrowserHelper._VCSRevert?5() @@ -8948,6 +8953,7 @@ eric5.VCS.ProjectHelper.VcsProjectHelper._vcsImport?5() eric5.VCS.ProjectHelper.VcsProjectHelper._vcsInfoDisplay?5() eric5.VCS.ProjectHelper.VcsProjectHelper._vcsLog?5() +eric5.VCS.ProjectHelper.VcsProjectHelper._vcsLogBrowser?5() eric5.VCS.ProjectHelper.VcsProjectHelper._vcsMerge?5() eric5.VCS.ProjectHelper.VcsProjectHelper._vcsRemove?5() eric5.VCS.ProjectHelper.VcsProjectHelper._vcsRevert?5() @@ -9015,6 +9021,7 @@ eric5.VCS.VersionControl.VersionControl.vcsInit?4(vcsDir, noDialog=False) eric5.VCS.VersionControl.VersionControl.vcsInitConfig?4(project) eric5.VCS.VersionControl.VersionControl.vcsLog?4(name) +eric5.VCS.VersionControl.VersionControl.vcsLogBrowser?4(name, isFile=False) eric5.VCS.VersionControl.VersionControl.vcsMerge?4(name) eric5.VCS.VersionControl.VersionControl.vcsMove?4(name, project, target=None, noDialog=False) eric5.VCS.VersionControl.VersionControl.vcsName?4()
--- a/APIs/Python3/eric5.bas Sun Mar 09 12:16:00 2014 +0100 +++ b/APIs/Python3/eric5.bas Sun Mar 09 17:06:40 2014 +0100 @@ -146,6 +146,7 @@ E5ClearableComboBox E5ComboBox E5ClearableLineEdit E5LineEdit E5ClickableLabel QLabel +E5ClickableLed E5Led E5ComboBox QComboBox E5DirCompleter QCompleter E5DnDTabBar E5WheelTabBar @@ -642,7 +643,7 @@ StackedWidget QStackedWidget StandardReport BaseReport StartDialog QDialog -StatusMonitorLed E5Led +StatusMonitorLed E5ClickableLed Subversion VersionControl SubversionPage ConfigurationPageBase Ui_SubversionPage SvgDiagram E5MainWindow
--- a/Documentation/Help/source.qhp Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Help/source.qhp Sun Mar 09 17:06:40 2014 +0100 @@ -3707,6 +3707,9 @@ <keyword name="E5ClickableLabel (Constructor)" id="E5ClickableLabel (Constructor)" ref="eric5.E5Gui.E5ClickableLabel.html#E5ClickableLabel.__init__" /> <keyword name="E5ClickableLabel (Module)" id="E5ClickableLabel (Module)" ref="eric5.E5Gui.E5ClickableLabel.html" /> <keyword name="E5ClickableLabel.mouseReleaseEvent" id="E5ClickableLabel.mouseReleaseEvent" ref="eric5.E5Gui.E5ClickableLabel.html#E5ClickableLabel.mouseReleaseEvent" /> + <keyword name="E5ClickableLed" id="E5ClickableLed" ref="eric5.E5Gui.E5Led.html#E5ClickableLed" /> + <keyword name="E5ClickableLed (Constructor)" id="E5ClickableLed (Constructor)" ref="eric5.E5Gui.E5Led.html#E5ClickableLed.__init__" /> + <keyword name="E5ClickableLed.mouseReleaseEvent" id="E5ClickableLed.mouseReleaseEvent" ref="eric5.E5Gui.E5Led.html#E5ClickableLed.mouseReleaseEvent" /> <keyword name="E5ComboBox" id="E5ComboBox" ref="eric5.E5Gui.E5ComboBox.html#E5ComboBox" /> <keyword name="E5ComboBox (Constructor)" id="E5ComboBox (Constructor)" ref="eric5.E5Gui.E5ComboBox.html#E5ComboBox.__init__" /> <keyword name="E5ComboBox (Module)" id="E5ComboBox (Module)" ref="eric5.E5Gui.E5ComboBox.html" /> @@ -5821,7 +5824,6 @@ <keyword name="Hg.hgIncoming" id="Hg.hgIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgIncoming" /> <keyword name="Hg.hgInfo" id="Hg.hgInfo" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgInfo" /> <keyword name="Hg.hgListTagBranch" id="Hg.hgListTagBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgListTagBranch" /> - <keyword name="Hg.hgLogBrowser" id="Hg.hgLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgLogBrowser" /> <keyword name="Hg.hgNormalizeURL" id="Hg.hgNormalizeURL" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgNormalizeURL" /> <keyword name="Hg.hgOutgoing" id="Hg.hgOutgoing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgOutgoing" /> <keyword name="Hg.hgPhase" id="Hg.hgPhase" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgPhase" /> @@ -5861,6 +5863,7 @@ <keyword name="Hg.vcsInit" id="Hg.vcsInit" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsInit" /> <keyword name="Hg.vcsInitConfig" id="Hg.vcsInitConfig" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsInitConfig" /> <keyword name="Hg.vcsLog" id="Hg.vcsLog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsLog" /> + <keyword name="Hg.vcsLogBrowser" id="Hg.vcsLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsLogBrowser" /> <keyword name="Hg.vcsMerge" id="Hg.vcsMerge" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsMerge" /> <keyword name="Hg.vcsMove" id="Hg.vcsMove" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsMove" /> <keyword name="Hg.vcsName" id="Hg.vcsName" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsName" /> @@ -6295,7 +6298,6 @@ <keyword name="HgProjectBrowserHelper.__HgCopy" id="HgProjectBrowserHelper.__HgCopy" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgCopy" /> <keyword name="HgProjectBrowserHelper.__HgExtendedDiff" id="HgProjectBrowserHelper.__HgExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgExtendedDiff" /> <keyword name="HgProjectBrowserHelper.__HgForget" id="HgProjectBrowserHelper.__HgForget" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgForget" /> - <keyword name="HgProjectBrowserHelper.__HgLogBrowser" id="HgProjectBrowserHelper.__HgLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgLogBrowser" /> <keyword name="HgProjectBrowserHelper.__HgMove" id="HgProjectBrowserHelper.__HgMove" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgMove" /> <keyword name="HgProjectBrowserHelper.__HgResolve" id="HgProjectBrowserHelper.__HgResolve" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgResolve" /> <keyword name="HgProjectBrowserHelper.__HgRevert" id="HgProjectBrowserHelper.__HgRevert" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgRevert" /> @@ -6338,7 +6340,6 @@ <keyword name="HgProjectHelper.__hgIdentifyBundle" id="HgProjectHelper.__hgIdentifyBundle" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgIdentifyBundle" /> <keyword name="HgProjectHelper.__hgImport" id="HgProjectHelper.__hgImport" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgImport" /> <keyword name="HgProjectHelper.__hgIncoming" id="HgProjectHelper.__hgIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgIncoming" /> - <keyword name="HgProjectHelper.__hgLogBrowser" id="HgProjectHelper.__hgLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgLogBrowser" /> <keyword name="HgProjectHelper.__hgOutgoing" id="HgProjectHelper.__hgOutgoing" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgOutgoing" /> <keyword name="HgProjectHelper.__hgParents" id="HgProjectHelper.__hgParents" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgParents" /> <keyword name="HgProjectHelper.__hgPhase" id="HgProjectHelper.__hgPhase" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgPhase" /> @@ -10469,10 +10470,12 @@ <keyword name="StatusMonitorLed (Module)" id="StatusMonitorLed (Module)" ref="eric5.VCS.StatusMonitorLed.html" /> <keyword name="StatusMonitorLed.__checkActions" id="StatusMonitorLed.__checkActions" ref="eric5.VCS.StatusMonitorLed.html#StatusMonitorLed.__checkActions" /> <keyword name="StatusMonitorLed.__checkStatus" id="StatusMonitorLed.__checkStatus" ref="eric5.VCS.StatusMonitorLed.html#StatusMonitorLed.__checkStatus" /> + <keyword name="StatusMonitorLed.__ledClicked" id="StatusMonitorLed.__ledClicked" ref="eric5.VCS.StatusMonitorLed.html#StatusMonitorLed.__ledClicked" /> <keyword name="StatusMonitorLed.__projectVcsMonitorStatus" id="StatusMonitorLed.__projectVcsMonitorStatus" ref="eric5.VCS.StatusMonitorLed.html#StatusMonitorLed.__projectVcsMonitorStatus" /> <keyword name="StatusMonitorLed.__setInterval" id="StatusMonitorLed.__setInterval" ref="eric5.VCS.StatusMonitorLed.html#StatusMonitorLed.__setInterval" /> <keyword name="StatusMonitorLed.__switchOff" id="StatusMonitorLed.__switchOff" ref="eric5.VCS.StatusMonitorLed.html#StatusMonitorLed.__switchOff" /> <keyword name="StatusMonitorLed.__switchOn" id="StatusMonitorLed.__switchOn" ref="eric5.VCS.StatusMonitorLed.html#StatusMonitorLed.__switchOn" /> + <keyword name="StatusMonitorLed.__vcsStateChanged" id="StatusMonitorLed.__vcsStateChanged" ref="eric5.VCS.StatusMonitorLed.html#StatusMonitorLed.__vcsStateChanged" /> <keyword name="StatusMonitorLed._showContextMenu" id="StatusMonitorLed._showContextMenu" ref="eric5.VCS.StatusMonitorLed.html#StatusMonitorLed._showContextMenu" /> <keyword name="StatusMonitorThread (Module)" id="StatusMonitorThread (Module)" ref="eric5.VCS.StatusMonitorThread.html" /> <keyword name="StyleGuide" id="StyleGuide" ref="eric5.Plugins.CheckerPlugins.CodeStyleChecker.pep8.html#StyleGuide" /> @@ -10540,8 +10543,6 @@ <keyword name="Subversion.svnListTagBranch" id="Subversion.svnListTagBranch" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnListTagBranch" /> <keyword name="Subversion.svnLock" id="Subversion.svnLock" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnLock" /> <keyword name="Subversion.svnLock" id="Subversion.svnLock" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnLock" /> - <keyword name="Subversion.svnLogBrowser" id="Subversion.svnLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnLogBrowser" /> - <keyword name="Subversion.svnLogBrowser" id="Subversion.svnLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnLogBrowser" /> <keyword name="Subversion.svnNormalizeURL" id="Subversion.svnNormalizeURL" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnNormalizeURL" /> <keyword name="Subversion.svnNormalizeURL" id="Subversion.svnNormalizeURL" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnNormalizeURL" /> <keyword name="Subversion.svnRelocate" id="Subversion.svnRelocate" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnRelocate" /> @@ -10600,6 +10601,8 @@ <keyword name="Subversion.vcsInitConfig" id="Subversion.vcsInitConfig" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsInitConfig" /> <keyword name="Subversion.vcsLog" id="Subversion.vcsLog" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsLog" /> <keyword name="Subversion.vcsLog" id="Subversion.vcsLog" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsLog" /> + <keyword name="Subversion.vcsLogBrowser" id="Subversion.vcsLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsLogBrowser" /> + <keyword name="Subversion.vcsLogBrowser" id="Subversion.vcsLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsLogBrowser" /> <keyword name="Subversion.vcsMerge" id="Subversion.vcsMerge" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsMerge" /> <keyword name="Subversion.vcsMerge" id="Subversion.vcsMerge" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsMerge" /> <keyword name="Subversion.vcsMove" id="Subversion.vcsMove" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsMove" /> @@ -10989,8 +10992,6 @@ <keyword name="SvnProjectBrowserHelper.__SVNListProps" id="SvnProjectBrowserHelper.__SVNListProps" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNListProps" /> <keyword name="SvnProjectBrowserHelper.__SVNLock" id="SvnProjectBrowserHelper.__SVNLock" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNLock" /> <keyword name="SvnProjectBrowserHelper.__SVNLock" id="SvnProjectBrowserHelper.__SVNLock" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNLock" /> - <keyword name="SvnProjectBrowserHelper.__SVNLogBrowser" id="SvnProjectBrowserHelper.__SVNLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNLogBrowser" /> - <keyword name="SvnProjectBrowserHelper.__SVNLogBrowser" id="SvnProjectBrowserHelper.__SVNLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNLogBrowser" /> <keyword name="SvnProjectBrowserHelper.__SVNMove" id="SvnProjectBrowserHelper.__SVNMove" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNMove" /> <keyword name="SvnProjectBrowserHelper.__SVNMove" id="SvnProjectBrowserHelper.__SVNMove" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNMove" /> <keyword name="SvnProjectBrowserHelper.__SVNRemoveFromChangelist" id="SvnProjectBrowserHelper.__SVNRemoveFromChangelist" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__SVNRemoveFromChangelist" /> @@ -11042,8 +11043,6 @@ <keyword name="SvnProjectHelper.__svnExtendedDiff" id="SvnProjectHelper.__svnExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnExtendedDiff" /> <keyword name="SvnProjectHelper.__svnExtendedDiff" id="SvnProjectHelper.__svnExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnExtendedDiff" /> <keyword name="SvnProjectHelper.__svnInfo" id="SvnProjectHelper.__svnInfo" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnInfo" /> - <keyword name="SvnProjectHelper.__svnLogBrowser" id="SvnProjectHelper.__svnLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnLogBrowser" /> - <keyword name="SvnProjectHelper.__svnLogBrowser" id="SvnProjectHelper.__svnLogBrowser" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnLogBrowser" /> <keyword name="SvnProjectHelper.__svnPropDel" id="SvnProjectHelper.__svnPropDel" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnPropDel" /> <keyword name="SvnProjectHelper.__svnPropDel" id="SvnProjectHelper.__svnPropDel" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnPropDel" /> <keyword name="SvnProjectHelper.__svnPropList" id="SvnProjectHelper.__svnPropList" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnPropList" /> @@ -12398,6 +12397,7 @@ <keyword name="VcsProjectBrowserHelper._VCSDiff" id="VcsProjectBrowserHelper._VCSDiff" ref="eric5.VCS.ProjectBrowserHelper.html#VcsProjectBrowserHelper._VCSDiff" /> <keyword name="VcsProjectBrowserHelper._VCSInfoDisplay" id="VcsProjectBrowserHelper._VCSInfoDisplay" ref="eric5.VCS.ProjectBrowserHelper.html#VcsProjectBrowserHelper._VCSInfoDisplay" /> <keyword name="VcsProjectBrowserHelper._VCSLog" id="VcsProjectBrowserHelper._VCSLog" ref="eric5.VCS.ProjectBrowserHelper.html#VcsProjectBrowserHelper._VCSLog" /> + <keyword name="VcsProjectBrowserHelper._VCSLogBrowser" id="VcsProjectBrowserHelper._VCSLogBrowser" ref="eric5.VCS.ProjectBrowserHelper.html#VcsProjectBrowserHelper._VCSLogBrowser" /> <keyword name="VcsProjectBrowserHelper._VCSMerge" id="VcsProjectBrowserHelper._VCSMerge" ref="eric5.VCS.ProjectBrowserHelper.html#VcsProjectBrowserHelper._VCSMerge" /> <keyword name="VcsProjectBrowserHelper._VCSRemove" id="VcsProjectBrowserHelper._VCSRemove" ref="eric5.VCS.ProjectBrowserHelper.html#VcsProjectBrowserHelper._VCSRemove" /> <keyword name="VcsProjectBrowserHelper._VCSRevert" id="VcsProjectBrowserHelper._VCSRevert" ref="eric5.VCS.ProjectBrowserHelper.html#VcsProjectBrowserHelper._VCSRevert" /> @@ -12421,6 +12421,7 @@ <keyword name="VcsProjectHelper._vcsImport" id="VcsProjectHelper._vcsImport" ref="eric5.VCS.ProjectHelper.html#VcsProjectHelper._vcsImport" /> <keyword name="VcsProjectHelper._vcsInfoDisplay" id="VcsProjectHelper._vcsInfoDisplay" ref="eric5.VCS.ProjectHelper.html#VcsProjectHelper._vcsInfoDisplay" /> <keyword name="VcsProjectHelper._vcsLog" id="VcsProjectHelper._vcsLog" ref="eric5.VCS.ProjectHelper.html#VcsProjectHelper._vcsLog" /> + <keyword name="VcsProjectHelper._vcsLogBrowser" id="VcsProjectHelper._vcsLogBrowser" ref="eric5.VCS.ProjectHelper.html#VcsProjectHelper._vcsLogBrowser" /> <keyword name="VcsProjectHelper._vcsMerge" id="VcsProjectHelper._vcsMerge" ref="eric5.VCS.ProjectHelper.html#VcsProjectHelper._vcsMerge" /> <keyword name="VcsProjectHelper._vcsRemove" id="VcsProjectHelper._vcsRemove" ref="eric5.VCS.ProjectHelper.html#VcsProjectHelper._vcsRemove" /> <keyword name="VcsProjectHelper._vcsRevert" id="VcsProjectHelper._vcsRevert" ref="eric5.VCS.ProjectHelper.html#VcsProjectHelper._vcsRevert" /> @@ -12508,6 +12509,7 @@ <keyword name="VersionControl.vcsInit" id="VersionControl.vcsInit" ref="eric5.VCS.VersionControl.html#VersionControl.vcsInit" /> <keyword name="VersionControl.vcsInitConfig" id="VersionControl.vcsInitConfig" ref="eric5.VCS.VersionControl.html#VersionControl.vcsInitConfig" /> <keyword name="VersionControl.vcsLog" id="VersionControl.vcsLog" ref="eric5.VCS.VersionControl.html#VersionControl.vcsLog" /> + <keyword name="VersionControl.vcsLogBrowser" id="VersionControl.vcsLogBrowser" ref="eric5.VCS.VersionControl.html#VersionControl.vcsLogBrowser" /> <keyword name="VersionControl.vcsMerge" id="VersionControl.vcsMerge" ref="eric5.VCS.VersionControl.html#VersionControl.vcsMerge" /> <keyword name="VersionControl.vcsMove" id="VersionControl.vcsMove" ref="eric5.VCS.VersionControl.html#VersionControl.vcsMove" /> <keyword name="VersionControl.vcsName" id="VersionControl.vcsName" ref="eric5.VCS.VersionControl.html#VersionControl.vcsName" />
--- a/Documentation/Source/eric5.E5Gui.E5ClickableLabel.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5ClickableLabel.html Sun Mar 09 17:06:40 2014 +0100 @@ -48,11 +48,11 @@ <dt>clicked(QPoint)</dt> <dd> emitted upon a click on the label - with the left buton + with the left button </dd><dt>middleClicked(QPoint)</dt> <dd> emitted upon a click on the label - with the middle buton or CTRL and left button + with the middle button or CTRL and left button </dd> </dl> <h3>Derived from</h3>
--- a/Documentation/Source/eric5.E5Gui.E5Led.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.E5Gui.E5Led.html Sun Mar 09 17:06:40 2014 +0100 @@ -32,6 +32,9 @@ <h3>Classes</h3> <table> <tr> +<td><a href="#E5ClickableLed">E5ClickableLed</a></td> +<td>Class implementing a clickable LED widget.</td> +</tr><tr> <td><a href="#E5Led">E5Led</a></td> <td>Class implementing a LED widget.</td> </tr> @@ -41,6 +44,78 @@ <tr><td>None</td></tr> </table> <hr /><hr /> +<a NAME="E5ClickableLed" ID="E5ClickableLed"></a> +<h2>E5ClickableLed</h2> +<p> + Class implementing a clickable LED widget. +</p><h3>Signals</h3> +<dl> +<dt>clicked(QPoint)</dt> +<dd> +emitted upon a click on the LED with the + left button +</dd><dt>middleClicked(QPoint)</dt> +<dd> +emitted upon a click on the LED with + the middle button or CTRL and left button +</dd> +</dl> +<h3>Derived from</h3> +E5Led +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#E5ClickableLed.__init__">E5ClickableLed</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#E5ClickableLed.mouseReleaseEvent">mouseReleaseEvent</a></td> +<td>Protected method handling mouse release events.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="E5ClickableLed.__init__" ID="E5ClickableLed.__init__"></a> +<h4>E5ClickableLed (Constructor)</h4> +<b>E5ClickableLed</b>(<i>parent=None, color=None, shape=E5LedCircular, rectRatio=1</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +reference to parent widget (QWidget) +</dd><dt><i>color</i></dt> +<dd> +color of the LED (QColor) +</dd><dt><i>shape</i></dt> +<dd> +shape of the LED (E5LedCircular, E5LedRectangular) +</dd><dt><i>rectRatio</i></dt> +<dd> +ratio width to height, if shape is rectangular (float) +</dd> +</dl><a NAME="E5ClickableLed.mouseReleaseEvent" ID="E5ClickableLed.mouseReleaseEvent"></a> +<h4>E5ClickableLed.mouseReleaseEvent</h4> +<b>mouseReleaseEvent</b>(<i>evt</i>) +<p> + Protected method handling mouse release events. +</p><dl> +<dt><i>evt</i></dt> +<dd> +mouse event (QMouseEvent) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="E5Led" ID="E5Led"></a> <h2>E5Led</h2> <p>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Sun Mar 09 17:06:40 2014 +0100 @@ -72,9 +72,6 @@ <td><a href="#HgProjectBrowserHelper.__HgForget">__HgForget</a></td> <td>Private slot called by the context menu to remove the selected file from the Mercurial repository leaving a copy in the project directory.</td> </tr><tr> -<td><a href="#HgProjectBrowserHelper.__HgLogBrowser">__HgLogBrowser</a></td> -<td>Private slot called by the context menu to show the log browser for a file.</td> -</tr><tr> <td><a href="#HgProjectBrowserHelper.__HgMove">__HgMove</a></td> <td>Private slot called by the context menu to move the selected file.</td> </tr><tr> @@ -179,12 +176,6 @@ <p> Private slot called by the context menu to remove the selected file from the Mercurial repository leaving a copy in the project directory. -</p><a NAME="HgProjectBrowserHelper.__HgLogBrowser" ID="HgProjectBrowserHelper.__HgLogBrowser"></a> -<h4>HgProjectBrowserHelper.__HgLogBrowser</h4> -<b>__HgLogBrowser</b>(<i></i>) -<p> - Private slot called by the context menu to show the log browser for a - file. </p><a NAME="HgProjectBrowserHelper.__HgMove" ID="HgProjectBrowserHelper.__HgMove"></a> <h4>HgProjectBrowserHelper.__HgMove</h4> <b>__HgMove</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Sun Mar 09 17:06:40 2014 +0100 @@ -132,9 +132,6 @@ <td><a href="#HgProjectHelper.__hgIncoming">__hgIncoming</a></td> <td>Private slot used to show the log of changes coming into the repository.</td> </tr><tr> -<td><a href="#HgProjectHelper.__hgLogBrowser">__hgLogBrowser</a></td> -<td>Private slot used to browse the log of the current project.</td> -</tr><tr> <td><a href="#HgProjectHelper.__hgOutgoing">__hgOutgoing</a></td> <td>Private slot used to show the log of changes going out of the repository.</td> </tr><tr> @@ -371,11 +368,6 @@ <p> Private slot used to show the log of changes coming into the repository. -</p><a NAME="HgProjectHelper.__hgLogBrowser" ID="HgProjectHelper.__hgLogBrowser"></a> -<h4>HgProjectHelper.__hgLogBrowser</h4> -<b>__hgLogBrowser</b>(<i></i>) -<p> - Private slot used to browse the log of the current project. </p><a NAME="HgProjectHelper.__hgOutgoing" ID="HgProjectHelper.__hgOutgoing"></a> <h4>HgProjectHelper.__hgOutgoing</h4> <b>__hgOutgoing</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Sun Mar 09 17:06:40 2014 +0100 @@ -193,9 +193,6 @@ <td><a href="#Hg.hgListTagBranch">hgListTagBranch</a></td> <td>Public method used to list the available tags or branches.</td> </tr><tr> -<td><a href="#Hg.hgLogBrowser">hgLogBrowser</a></td> -<td>Public method used to browse the log of a file/directory from the Mercurial repository.</td> -</tr><tr> <td><a href="#Hg.hgNormalizeURL">hgNormalizeURL</a></td> <td>Public method to normalize a url for Mercurial.</td> </tr><tr> @@ -313,6 +310,9 @@ <td><a href="#Hg.vcsLog">vcsLog</a></td> <td>Public method used to view the log of a file/directory from the Mercurial repository.</td> </tr><tr> +<td><a href="#Hg.vcsLogBrowser">vcsLogBrowser</a></td> +<td>Public method used to browse the log of a file/directory from the Mercurial repository.</td> +</tr><tr> <td><a href="#Hg.vcsMerge">vcsMerge</a></td> <td>Public method used to merge a URL/revision into the local project.</td> </tr><tr> @@ -872,21 +872,6 @@ flag indicating listing of branches or tags (False = branches, True = tags) </dd> -</dl><a NAME="Hg.hgLogBrowser" ID="Hg.hgLogBrowser"></a> -<h4>Hg.hgLogBrowser</h4> -<b>hgLogBrowser</b>(<i>path, isFile=False</i>) -<p> - Public method used to browse the log of a file/directory from the - Mercurial repository. -</p><dl> -<dt><i>path</i></dt> -<dd> -file/directory name to show the log of (string) -</dd><dt><i>isFile=</i></dt> -<dd> -flag indicating log for a file is to be shown - (boolean) -</dd> </dl><a NAME="Hg.hgNormalizeURL" ID="Hg.hgNormalizeURL"></a> <h4>Hg.hgNormalizeURL</h4> <b>hgNormalizeURL</b>(<i>url</i>) @@ -1463,6 +1448,21 @@ <dd> file/directory name to show the log of (string) </dd> +</dl><a NAME="Hg.vcsLogBrowser" ID="Hg.vcsLogBrowser"></a> +<h4>Hg.vcsLogBrowser</h4> +<b>vcsLogBrowser</b>(<i>name, isFile=False</i>) +<p> + Public method used to browse the log of a file/directory from the + Mercurial repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to show the log of (string) +</dd><dt><i>isFile=</i></dt> +<dd> +flag indicating log for a file is to be shown + (boolean) +</dd> </dl><a NAME="Hg.vcsMerge" ID="Hg.vcsMerge"></a> <h4>Hg.vcsMerge</h4> <b>vcsMerge</b>(<i>name</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html Sun Mar 09 17:06:40 2014 +0100 @@ -90,9 +90,6 @@ <td><a href="#SvnProjectBrowserHelper.__SVNLock">__SVNLock</a></td> <td>Private slot called by the context menu to lock files in the repository.</td> </tr><tr> -<td><a href="#SvnProjectBrowserHelper.__SVNLogBrowser">__SVNLogBrowser</a></td> -<td>Private slot called by the context menu to show the log browser for a file.</td> -</tr><tr> <td><a href="#SvnProjectBrowserHelper.__SVNMove">__SVNMove</a></td> <td>Private slot called by the context menu to move the selected file.</td> </tr><tr> @@ -239,12 +236,6 @@ <p> Private slot called by the context menu to lock files in the repository. -</p><a NAME="SvnProjectBrowserHelper.__SVNLogBrowser" ID="SvnProjectBrowserHelper.__SVNLogBrowser"></a> -<h4>SvnProjectBrowserHelper.__SVNLogBrowser</h4> -<b>__SVNLogBrowser</b>(<i></i>) -<p> - Private slot called by the context menu to show the log browser for a - file. </p><a NAME="SvnProjectBrowserHelper.__SVNMove" ID="SvnProjectBrowserHelper.__SVNMove"></a> <h4>SvnProjectBrowserHelper.__SVNMove</h4> <b>__SVNMove</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html Sun Mar 09 17:06:40 2014 +0100 @@ -75,9 +75,6 @@ <td><a href="#SvnProjectHelper.__svnInfo">__svnInfo</a></td> <td>Private slot used to show repository information for the local project.</td> </tr><tr> -<td><a href="#SvnProjectHelper.__svnLogBrowser">__svnLogBrowser</a></td> -<td>Private slot used to browse the log of the current project.</td> -</tr><tr> <td><a href="#SvnProjectHelper.__svnPropDel">__svnPropDel</a></td> <td>Private slot used to delete a property for the project files.</td> </tr><tr> @@ -164,11 +161,6 @@ <b>__svnInfo</b>(<i></i>) <p> Private slot used to show repository information for the local project. -</p><a NAME="SvnProjectHelper.__svnLogBrowser" ID="SvnProjectHelper.__svnLogBrowser"></a> -<h4>SvnProjectHelper.__svnLogBrowser</h4> -<b>__svnLogBrowser</b>(<i></i>) -<p> - Private slot used to browse the log of the current project. </p><a NAME="SvnProjectHelper.__svnPropDel" ID="SvnProjectHelper.__svnPropDel"></a> <h4>SvnProjectHelper.__svnPropDel</h4> <b>__svnPropDel</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html Sun Mar 09 17:06:40 2014 +0100 @@ -135,9 +135,6 @@ <td><a href="#Subversion.svnLock">svnLock</a></td> <td>Public method used to lock a file in the Subversion repository.</td> </tr><tr> -<td><a href="#Subversion.svnLogBrowser">svnLogBrowser</a></td> -<td>Public method used to browse the log of a file/directory from the Subversion repository.</td> -</tr><tr> <td><a href="#Subversion.svnNormalizeURL">svnNormalizeURL</a></td> <td>Public method to normalize a url for subversion.</td> </tr><tr> @@ -225,6 +222,9 @@ <td><a href="#Subversion.vcsLog">vcsLog</a></td> <td>Public method used to view the log of a file/directory from the Subversion repository.</td> </tr><tr> +<td><a href="#Subversion.vcsLogBrowser">vcsLogBrowser</a></td> +<td>Public method used to browse the log of a file/directory from the Subversion repository.</td> +</tr><tr> <td><a href="#Subversion.vcsMerge">vcsMerge</a></td> <td>Public method used to merge a URL/revision into the local project.</td> </tr><tr> @@ -640,20 +640,6 @@ reference to the parent object of the subversion dialog (QWidget) </dd> -</dl><a NAME="Subversion.svnLogBrowser" ID="Subversion.svnLogBrowser"></a> -<h4>Subversion.svnLogBrowser</h4> -<b>svnLogBrowser</b>(<i>path, isFile=False</i>) -<p> - Public method used to browse the log of a file/directory from the - Subversion repository. -</p><dl> -<dt><i>path</i></dt> -<dd> -file/directory name to show the log of (string) -</dd><dt><i>isFile</i></dt> -<dd> -flag indicating log for a file is to be shown (boolean) -</dd> </dl><a NAME="Subversion.svnNormalizeURL" ID="Subversion.svnNormalizeURL"></a> <h4>Subversion.svnNormalizeURL</h4> <b>svnNormalizeURL</b>(<i>url</i>) @@ -1100,6 +1086,20 @@ <dd> file/directory name to show the log of (string) </dd> +</dl><a NAME="Subversion.vcsLogBrowser" ID="Subversion.vcsLogBrowser"></a> +<h4>Subversion.vcsLogBrowser</h4> +<b>vcsLogBrowser</b>(<i>name, isFile=False</i>) +<p> + Public method used to browse the log of a file/directory from the + Subversion repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to show the log of (string) +</dd><dt><i>isFile</i></dt> +<dd> +flag indicating log for a file is to be shown (boolean) +</dd> </dl><a NAME="Subversion.vcsMerge" ID="Subversion.vcsMerge"></a> <h4>Subversion.vcsMerge</h4> <b>vcsMerge</b>(<i>name</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html Sun Mar 09 17:06:40 2014 +0100 @@ -87,9 +87,6 @@ <td><a href="#SvnProjectBrowserHelper.__SVNLock">__SVNLock</a></td> <td>Private slot called by the context menu to lock files in the repository.</td> </tr><tr> -<td><a href="#SvnProjectBrowserHelper.__SVNLogBrowser">__SVNLogBrowser</a></td> -<td>Private slot called by the context menu to show the log browser for a file.</td> -</tr><tr> <td><a href="#SvnProjectBrowserHelper.__SVNMove">__SVNMove</a></td> <td>Private slot called by the context menu to move the selected file.</td> </tr><tr> @@ -230,12 +227,6 @@ <p> Private slot called by the context menu to lock files in the repository. -</p><a NAME="SvnProjectBrowserHelper.__SVNLogBrowser" ID="SvnProjectBrowserHelper.__SVNLogBrowser"></a> -<h4>SvnProjectBrowserHelper.__SVNLogBrowser</h4> -<b>__SVNLogBrowser</b>(<i></i>) -<p> - Private slot called by the context menu to show the log browser for - a file. </p><a NAME="SvnProjectBrowserHelper.__SVNMove" ID="SvnProjectBrowserHelper.__SVNMove"></a> <h4>SvnProjectBrowserHelper.__SVNMove</h4> <b>__SVNMove</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html Sun Mar 09 17:06:40 2014 +0100 @@ -72,9 +72,6 @@ <td><a href="#SvnProjectHelper.__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.__svnLogBrowser">__svnLogBrowser</a></td> -<td>Private slot used to browse the log of the current project.</td> -</tr><tr> <td><a href="#SvnProjectHelper.__svnPropDel">__svnPropDel</a></td> <td>Private slot used to delete a property for the project files.</td> </tr><tr> @@ -156,11 +153,6 @@ <p> Private slot used to perform a svn diff with the selection of revisions. -</p><a NAME="SvnProjectHelper.__svnLogBrowser" ID="SvnProjectHelper.__svnLogBrowser"></a> -<h4>SvnProjectHelper.__svnLogBrowser</h4> -<b>__svnLogBrowser</b>(<i></i>) -<p> - Private slot used to browse the log of the current project. </p><a NAME="SvnProjectHelper.__svnPropDel" ID="SvnProjectHelper.__svnPropDel"></a> <h4>SvnProjectHelper.__svnPropDel</h4> <b>__svnPropDel</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html Sun Mar 09 17:06:40 2014 +0100 @@ -126,9 +126,6 @@ <td><a href="#Subversion.svnLock">svnLock</a></td> <td>Public method used to lock a file in the Subversion repository.</td> </tr><tr> -<td><a href="#Subversion.svnLogBrowser">svnLogBrowser</a></td> -<td>Public method used to browse the log of a file/directory from the Subversion repository.</td> -</tr><tr> <td><a href="#Subversion.svnNormalizeURL">svnNormalizeURL</a></td> <td>Public method to normalize a url for subversion.</td> </tr><tr> @@ -216,6 +213,9 @@ <td><a href="#Subversion.vcsLog">vcsLog</a></td> <td>Public method used to view the log of a file/directory from the Subversion repository.</td> </tr><tr> +<td><a href="#Subversion.vcsLogBrowser">vcsLogBrowser</a></td> +<td>Public method used to browse the log of a file/directory from the Subversion repository.</td> +</tr><tr> <td><a href="#Subversion.vcsMerge">vcsMerge</a></td> <td>Public method used to merge a URL/revision into the local project.</td> </tr><tr> @@ -592,20 +592,6 @@ reference to the parent object of the subversion dialog (QWidget) </dd> -</dl><a NAME="Subversion.svnLogBrowser" ID="Subversion.svnLogBrowser"></a> -<h4>Subversion.svnLogBrowser</h4> -<b>svnLogBrowser</b>(<i>path, isFile=False</i>) -<p> - Public method used to browse the log of a file/directory from the - Subversion repository. -</p><dl> -<dt><i>path</i></dt> -<dd> -file/directory name to show the log of (string) -</dd><dt><i>isFile</i></dt> -<dd> -flag indicating log for a file is to be shown (boolean) -</dd> </dl><a NAME="Subversion.svnNormalizeURL" ID="Subversion.svnNormalizeURL"></a> <h4>Subversion.svnNormalizeURL</h4> <b>svnNormalizeURL</b>(<i>url</i>) @@ -1051,6 +1037,20 @@ <dd> file/directory name to show the log of (string) </dd> +</dl><a NAME="Subversion.vcsLogBrowser" ID="Subversion.vcsLogBrowser"></a> +<h4>Subversion.vcsLogBrowser</h4> +<b>vcsLogBrowser</b>(<i>name, isFile=False</i>) +<p> + Public method used to browse the log of a file/directory from the + Subversion repository. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to show the log of (string) +</dd><dt><i>isFile</i></dt> +<dd> +flag indicating log for a file is to be shown (boolean) +</dd> </dl><a NAME="Subversion.vcsMerge" ID="Subversion.vcsMerge"></a> <h4>Subversion.vcsMerge</h4> <b>vcsMerge</b>(<i>name</i>)
--- a/Documentation/Source/eric5.VCS.ProjectBrowserHelper.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.VCS.ProjectBrowserHelper.html Sun Mar 09 17:06:40 2014 +0100 @@ -78,6 +78,9 @@ <td><a href="#VcsProjectBrowserHelper._VCSLog">_VCSLog</a></td> <td>Protected slot called by the context menu to show the VCS log of a file/directory.</td> </tr><tr> +<td><a href="#VcsProjectBrowserHelper._VCSLogBrowser">_VCSLogBrowser</a></td> +<td>Protected slot called by the context menu to show the log browser for a file.</td> +</tr><tr> <td><a href="#VcsProjectBrowserHelper._VCSMerge">_VCSMerge</a></td> <td>Protected slot called by the context menu to merge changes into to a file.</td> </tr><tr> @@ -179,6 +182,12 @@ <p> Protected slot called by the context menu to show the VCS log of a file/directory. +</p><a NAME="VcsProjectBrowserHelper._VCSLogBrowser" ID="VcsProjectBrowserHelper._VCSLogBrowser"></a> +<h4>VcsProjectBrowserHelper._VCSLogBrowser</h4> +<b>_VCSLogBrowser</b>(<i></i>) +<p> + Protected slot called by the context menu to show the log browser for a + file. </p><a NAME="VcsProjectBrowserHelper._VCSMerge" ID="VcsProjectBrowserHelper._VCSMerge"></a> <h4>VcsProjectBrowserHelper._VCSMerge</h4> <b>_VCSMerge</b>(<i></i>)
--- a/Documentation/Source/eric5.VCS.ProjectHelper.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.VCS.ProjectHelper.html Sun Mar 09 17:06:40 2014 +0100 @@ -90,6 +90,9 @@ <td><a href="#VcsProjectHelper._vcsLog">_vcsLog</a></td> <td>Protected slot used to show the log of the local project.</td> </tr><tr> +<td><a href="#VcsProjectHelper._vcsLogBrowser">_vcsLogBrowser</a></td> +<td>Protected slot used to show the log of the local project with a log browser dialog.</td> +</tr><tr> <td><a href="#VcsProjectHelper._vcsMerge">_vcsMerge</a></td> <td>Protected slot used to merge changes of a tag/revision into the local project.</td> </tr><tr> @@ -213,6 +216,12 @@ <b>_vcsLog</b>(<i></i>) <p> Protected slot used to show the log of the local project. +</p><a NAME="VcsProjectHelper._vcsLogBrowser" ID="VcsProjectHelper._vcsLogBrowser"></a> +<h4>VcsProjectHelper._vcsLogBrowser</h4> +<b>_vcsLogBrowser</b>(<i></i>) +<p> + Protected slot used to show the log of the local project with a + log browser dialog. </p><a NAME="VcsProjectHelper._vcsMerge" ID="VcsProjectHelper._vcsMerge"></a> <h4>VcsProjectHelper._vcsMerge</h4> <b>_vcsMerge</b>(<i></i>)
--- a/Documentation/Source/eric5.VCS.StatusMonitorLed.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.VCS.StatusMonitorLed.html Sun Mar 09 17:06:40 2014 +0100 @@ -47,7 +47,7 @@ thread. </p> <h3>Derived from</h3> -E5Led +E5ClickableLed <h3>Class Attributes</h3> <table> <tr><td>None</td></tr> @@ -68,6 +68,9 @@ <td><a href="#StatusMonitorLed.__checkStatus">__checkStatus</a></td> <td>Private slot to initiate a new status check.</td> </tr><tr> +<td><a href="#StatusMonitorLed.__ledClicked">__ledClicked</a></td> +<td>Private slot to react upon clicks on the LED.</td> +</tr><tr> <td><a href="#StatusMonitorLed.__projectVcsMonitorStatus">__projectVcsMonitorStatus</a></td> <td>Private method to receive the status monitor status.</td> </tr><tr> @@ -80,6 +83,9 @@ <td><a href="#StatusMonitorLed.__switchOn">__switchOn</a></td> <td>Private slot to switch the status monitor thread to On.</td> </tr><tr> +<td><a href="#StatusMonitorLed.__vcsStateChanged">__vcsStateChanged</a></td> +<td>Private slot to handle a change in the vcs state.</td> +</tr><tr> <td><a href="#StatusMonitorLed._showContextMenu">_showContextMenu</a></td> <td>Protected slot to show the context menu.</td> </tr> @@ -111,7 +117,17 @@ <b>__checkStatus</b>(<i></i>) <p> Private slot to initiate a new status check. -</p><a NAME="StatusMonitorLed.__projectVcsMonitorStatus" ID="StatusMonitorLed.__projectVcsMonitorStatus"></a> +</p><a NAME="StatusMonitorLed.__ledClicked" ID="StatusMonitorLed.__ledClicked"></a> +<h4>StatusMonitorLed.__ledClicked</h4> +<b>__ledClicked</b>(<i>pos</i>) +<p> + Private slot to react upon clicks on the LED. +</p><dl> +<dt><i>pos</i></dt> +<dd> +position of the click (QPoint) +</dd> +</dl><a NAME="StatusMonitorLed.__projectVcsMonitorStatus" ID="StatusMonitorLed.__projectVcsMonitorStatus"></a> <h4>StatusMonitorLed.__projectVcsMonitorStatus</h4> <b>__projectVcsMonitorStatus</b>(<i>status, statusMsg</i>) <p> @@ -139,7 +155,17 @@ <b>__switchOn</b>(<i></i>) <p> Private slot to switch the status monitor thread to On. -</p><a NAME="StatusMonitorLed._showContextMenu" ID="StatusMonitorLed._showContextMenu"></a> +</p><a NAME="StatusMonitorLed.__vcsStateChanged" ID="StatusMonitorLed.__vcsStateChanged"></a> +<h4>StatusMonitorLed.__vcsStateChanged</h4> +<b>__vcsStateChanged</b>(<i>state</i>) +<p> + Private slot to handle a change in the vcs state. +</p><dl> +<dt><i>state</i></dt> +<dd> +new vcs state (string) +</dd> +</dl><a NAME="StatusMonitorLed._showContextMenu" ID="StatusMonitorLed._showContextMenu"></a> <h4>StatusMonitorLed._showContextMenu</h4> <b>_showContextMenu</b>(<i>coord</i>) <p>
--- a/Documentation/Source/eric5.VCS.VersionControl.html Sun Mar 09 12:16:00 2014 +0100 +++ b/Documentation/Source/eric5.VCS.VersionControl.html Sun Mar 09 17:06:40 2014 +0100 @@ -193,6 +193,9 @@ <td><a href="#VersionControl.vcsLog">vcsLog</a></td> <td>Public method used to view the log of a file/directory in the vcs.</td> </tr><tr> +<td><a href="#VersionControl.vcsLogBrowser">vcsLogBrowser</a></td> +<td>Public method used to view the log of a file/directory in the vcs with a log browser dialog.</td> +</tr><tr> <td><a href="#VersionControl.vcsMerge">vcsMerge</a></td> <td>Public method used to merge a tag/branch into the local project.</td> </tr><tr> @@ -902,6 +905,27 @@ to indicate that this method must be implemented by a subclass </dd> +</dl><a NAME="VersionControl.vcsLogBrowser" ID="VersionControl.vcsLogBrowser"></a> +<h4>VersionControl.vcsLogBrowser</h4> +<b>vcsLogBrowser</b>(<i>name, isFile=False</i>) +<p> + Public method used to view the log of a file/directory in the vcs + with a log browser dialog. +</p><dl> +<dt><i>name</i></dt> +<dd> +file/directory name to show the log for (string) +</dd><dt><i>isFile=</i></dt> +<dd> +flag indicating log for a file is to be shown + (boolean) +</dd> +</dl><dl> +<dt>Raises <b>RuntimeError</b>:</dt> +<dd> +to indicate that this method must be + implemented by a subclass +</dd> </dl><a NAME="VersionControl.vcsMerge" ID="VersionControl.vcsMerge"></a> <h4>VersionControl.vcsMerge</h4> <b>vcsMerge</b>(<i>name</i>)
--- a/E5Gui/E5ClickableLabel.py Sun Mar 09 12:16:00 2014 +0100 +++ b/E5Gui/E5ClickableLabel.py Sun Mar 09 17:06:40 2014 +0100 @@ -16,9 +16,9 @@ Class implementing a clickable label. @signal clicked(QPoint) emitted upon a click on the label - with the left buton + with the left button @signal middleClicked(QPoint) emitted upon a click on the label - with the middle buton or CTRL and left button + with the middle button or CTRL and left button """ clicked = pyqtSignal(QPoint) middleClicked = pyqtSignal(QPoint)
--- a/E5Gui/E5Led.py Sun Mar 09 12:16:00 2014 +0100 +++ b/E5Gui/E5Led.py Sun Mar 09 17:06:40 2014 +0100 @@ -9,7 +9,7 @@ It was inspired by KLed. """ -from PyQt4.QtCore import Qt, QSize +from PyQt4.QtCore import pyqtSignal, Qt, QSize, QPoint from PyQt4.QtGui import QWidget, QColor, QRadialGradient, QPalette, QPainter, \ QBrush @@ -269,3 +269,45 @@ @return size hint (QSize) """ return QSize(18, 18) + + +class E5ClickableLed(E5Led): + """ + Class implementing a clickable LED widget. + + @signal clicked(QPoint) emitted upon a click on the LED with the + left button + @signal middleClicked(QPoint) emitted upon a click on the LED with + the middle button or CTRL and left button + """ + clicked = pyqtSignal(QPoint) + middleClicked = pyqtSignal(QPoint) + + def __init__(self, parent=None, color=None, shape=E5LedCircular, + rectRatio=1): + """ + Constructor + + @param parent reference to parent widget (QWidget) + @param color color of the LED (QColor) + @param shape shape of the LED (E5LedCircular, E5LedRectangular) + @param rectRatio ratio width to height, if shape is rectangular (float) + """ + super().__init__(parent, color, shape, rectRatio) + + def mouseReleaseEvent(self, evt): + """ + Protected method handling mouse release events. + + @param evt mouse event (QMouseEvent) + """ + if evt.button() == Qt.LeftButton and self.rect().contains(evt.pos()): + if evt.modifiers() == Qt.ControlModifier: + self.middleClicked.emit(evt.globalPos()) + else: + self.clicked.emit(evt.globalPos()) + elif evt.button() == Qt.MiddleButton and \ + self.rect().contains(evt.pos()): + self.middleClicked.emit(evt.globalPos()) + else: + super().mouseReleaseEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sun Mar 09 12:16:00 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sun Mar 09 17:06:40 2014 +0100 @@ -313,7 +313,7 @@ self.vcsMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log browser'), self.__HgLogBrowser) + self.tr('Show log browser'), self._VCSLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( @@ -531,7 +531,7 @@ self.vcsDirMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log browser'), self.__HgLogBrowser) + self.tr('Show log browser'), self._VCSLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( @@ -739,20 +739,6 @@ fn = itm.fileName() self.vcs.hgAnnotate(fn) - def __HgLogBrowser(self): - """ - Private slot called by the context menu to show the log browser for a - file. - """ - itm = self.browser.currentItem() - try: - fn = itm.fileName() - isFile = True - except AttributeError: - fn = itm.dirName() - isFile = False - self.vcs.hgLogBrowser(fn, isFile=isFile) - def __HgResolve(self): """ Private slot called by the context menu to resolve conflicts of a file.
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sun Mar 09 12:16:00 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sun Mar 09 17:06:40 2014 +0100 @@ -272,7 +272,7 @@ """ project. A limited number of entries is shown first.""" """ More can be retrieved later on.</p>""" )) - self.hgLogBrowserAct.triggered.connect(self.__hgLogBrowser) + self.hgLogBrowserAct.triggered.connect(self._vcsLogBrowser) self.actions.append(self.hgLogBrowserAct) self.vcsDiffAct = E5Action( @@ -1212,12 +1212,6 @@ """ self.vcs.hgExtendedDiff(self.project.ppath) - def __hgLogBrowser(self): - """ - Private slot used to browse the log of the current project. - """ - self.vcs.hgLogBrowser(self.project.ppath) - def __hgIncoming(self): """ Private slot used to show the log of changes coming into the
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Mar 09 12:16:00 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Mar 09 17:06:40 2014 +0100 @@ -1848,12 +1848,12 @@ self.sbsDiff.show() self.sbsDiff.compare(output1, output2, name1, name2) - def hgLogBrowser(self, path, isFile=False): + def vcsLogBrowser(self, name, isFile=False): """ Public method used to browse the log of a file/directory from the Mercurial repository. - @param path file/directory name to show the log of (string) + @param name file/directory name to show the log of (string) @keyparam isFile flag indicating log for a file is to be shown (boolean) """ @@ -1861,7 +1861,7 @@ from .HgLogBrowserDialog import HgLogBrowserDialog self.logBrowser = HgLogBrowserDialog(self) self.logBrowser.show() - self.logBrowser.start(path, isFile=isFile) + self.logBrowser.start(name, isFile=isFile) def hgIncoming(self, name): """
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Sun Mar 09 12:16:00 2014 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Sun Mar 09 17:06:40 2014 +0100 @@ -255,7 +255,7 @@ self.vcsMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log browser'), self.__SVNLogBrowser) + self.tr('Show log browser'), self._VCSLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( @@ -567,7 +567,7 @@ self.vcsDirMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log browser'), self.__SVNLogBrowser) + self.tr('Show log browser'), self._VCSLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( @@ -871,20 +871,6 @@ fn = itm.fileName() self.vcs.svnSbsDiff(fn, extended=True) - def __SVNLogBrowser(self): - """ - Private slot called by the context menu to show the log browser for a - file. - """ - itm = self.browser.currentItem() - try: - fn = itm.fileName() - isFile = True - except AttributeError: - fn = itm.dirName() - isFile = False - self.vcs.svnLogBrowser(fn, isFile=isFile) - def __SVNBlame(self): """ Private slot called by the context menu to show the blame of a file.
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Sun Mar 09 12:16:00 2014 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Sun Mar 09 17:06:40 2014 +0100 @@ -122,7 +122,7 @@ """ project. A limited number of entries is shown first. More""" """ can be retrieved later on.</p>""" )) - self.svnLogBrowserAct.triggered.connect(self.__svnLogBrowser) + self.svnLogBrowserAct.triggered.connect(self._vcsLogBrowser) self.actions.append(self.svnLogBrowserAct) self.vcsDiffAct = E5Action( @@ -608,12 +608,6 @@ """ self.vcs.svnUrlDiff(self.project.ppath) - def __svnLogBrowser(self): - """ - Private slot used to browse the log of the current project. - """ - self.vcs.svnLogBrowser(self.project.ppath) - def __svnInfo(self): """ Private slot used to show repository information for the local project.
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Sun Mar 09 12:16:00 2014 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Sun Mar 09 17:06:40 2014 +0100 @@ -2201,12 +2201,12 @@ self.sbsDiff.show() self.sbsDiff.compare(output1, output2, name1, name2) - def svnLogBrowser(self, path, isFile=False): + def vcsLogBrowser(self, name, isFile=False): """ Public method used to browse the log of a file/directory from the Subversion repository. - @param path file/directory name to show the log of (string) + @param name file/directory name to show the log of (string) @param isFile flag indicating log for a file is to be shown (boolean) """ if self.logBrowser is None: @@ -2214,7 +2214,7 @@ self.logBrowser = SvnLogBrowserDialog(self) self.logBrowser.show() QApplication.processEvents() - self.logBrowser.start(path, isFile=isFile) + self.logBrowser.start(name, isFile=isFile) def svnLock(self, name, stealIt=False, parent=None): """
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sun Mar 09 12:16:00 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sun Mar 09 17:06:40 2014 +0100 @@ -253,7 +253,7 @@ self.vcsMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log browser'), self.__SVNLogBrowser) + self.tr('Show log browser'), self._VCSLogBrowser) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( @@ -566,7 +566,7 @@ self.vcsDirMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsLog.png"), - self.tr('Show log browser'), self.__SVNLogBrowser) + self.tr('Show log browser'), self._VCSLogBrowser) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction( @@ -867,20 +867,6 @@ fn = itm.fileName() self.vcs.svnSbsDiff(fn, extended=True) - def __SVNLogBrowser(self): - """ - Private slot called by the context menu to show the log browser for - a file. - """ - itm = self.browser.currentItem() - try: - fn = itm.fileName() - isFile = True - except AttributeError: - fn = itm.dirName() - isFile = False - self.vcs.svnLogBrowser(fn, isFile=isFile) - def __SVNBlame(self): """ Private slot called by the context menu to show the blame of a file.
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Sun Mar 09 12:16:00 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Sun Mar 09 17:06:40 2014 +0100 @@ -122,7 +122,7 @@ """ project. A limited number of entries is shown first. More""" """ can be retrieved later on.</p>""" )) - self.svnLogBrowserAct.triggered.connect(self.__svnLogBrowser) + self.svnLogBrowserAct.triggered.connect(self._vcsLogBrowser) self.actions.append(self.svnLogBrowserAct) self.vcsDiffAct = E5Action( @@ -592,12 +592,6 @@ """ self.vcs.svnUrlDiff(self.project.ppath) - def __svnLogBrowser(self): - """ - Private slot used to browse the log of the current project. - """ - self.vcs.svnLogBrowser(self.project.ppath) - def __svnRelocate(self): """ Private slot used to relocate the working copy to a new repository URL.
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Sun Mar 09 12:16:00 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Sun Mar 09 17:06:40 2014 +0100 @@ -2032,19 +2032,19 @@ self.sbsDiff.show() self.sbsDiff.compare(output1, output2, name1, name2) - def svnLogBrowser(self, path, isFile=False): + def vcsLogBrowser(self, name, isFile=False): """ Public method used to browse the log of a file/directory from the Subversion repository. - @param path file/directory name to show the log of (string) + @param name file/directory name to show the log of (string) @param isFile flag indicating log for a file is to be shown (boolean) """ if self.logBrowser is None: from .SvnLogBrowserDialog import SvnLogBrowserDialog self.logBrowser = SvnLogBrowserDialog(self) self.logBrowser.show() - self.logBrowser.start(path, isFile=isFile) + self.logBrowser.start(name, isFile=isFile) def svnLock(self, name, stealIt=False, parent=None): """
--- a/VCS/ProjectBrowserHelper.py Sun Mar 09 12:16:00 2014 +0100 +++ b/VCS/ProjectBrowserHelper.py Sun Mar 09 17:06:40 2014 +0100 @@ -314,6 +314,20 @@ except AttributeError: fn = itm.dirName() self.vcs.vcsLog(fn) + + def _VCSLogBrowser(self): + """ + Protected slot called by the context menu to show the log browser for a + file. + """ + itm = self.browser.currentItem() + try: + fn = itm.fileName() + isFile = True + except AttributeError: + fn = itm.dirName() + isFile = False + self.vcs.vcsLogBrowser(fn, isFile=isFile) def _VCSDiff(self): """
--- a/VCS/ProjectHelper.py Sun Mar 09 12:16:00 2014 +0100 +++ b/VCS/ProjectHelper.py Sun Mar 09 17:06:40 2014 +0100 @@ -449,6 +449,13 @@ """ self.vcs.vcsLog(self.project.ppath) + def _vcsLogBrowser(self): + """ + Protected slot used to show the log of the local project with a + log browser dialog. + """ + self.vcs.vcsLogBrowser(self.project.ppath) + def _vcsDiff(self): """ Protected slot used to show the difference of the local project to
--- a/VCS/StatusMonitorLed.py Sun Mar 09 12:16:00 2014 +0100 +++ b/VCS/StatusMonitorLed.py Sun Mar 09 17:06:40 2014 +0100 @@ -11,12 +11,12 @@ from PyQt4.QtCore import Qt from PyQt4.QtGui import QColor, QInputDialog, QMenu -from E5Gui.E5Led import E5Led, E5LedRectangular +from E5Gui.E5Led import E5ClickableLed, E5LedRectangular import Preferences -class StatusMonitorLed(E5Led): +class StatusMonitorLed(E5ClickableLed): """ Class implementing a LED to indicate the status of the VCS status monitor thread. @@ -28,9 +28,11 @@ @param project reference to the project object (Project.Project) @param parent reference to the parent object (QWidget) """ - E5Led.__init__(self, parent, shape=E5LedRectangular, rectRatio=1.0) + super().__init__(parent, shape=E5LedRectangular, rectRatio=1.0) + self.__vcsClean = True self.project = project + self.vcsMonitorLedColors = { "off": QColor(Qt.lightGray), "ok": QColor(Qt.green), @@ -72,6 +74,8 @@ self.customContextMenuRequested.connect(self._showContextMenu) self.project.vcsStatusMonitorStatus.connect( self.__projectVcsMonitorStatus) + self.project.getModel().vcsStateChanged.connect(self.__vcsStateChanged) + self.clicked.connect(self.__ledClicked) def __checkActions(self): """ @@ -143,3 +147,28 @@ Private slot to switch the status monitor thread to Off. """ self.project.stopStatusMonitor() + + def __vcsStateChanged(self, state): + """ + Private slot to handle a change in the vcs state. + + @param state new vcs state (string) + """ + self.__vcsClean = state == " " + + def __ledClicked(self, pos): + """ + Private slot to react upon clicks on the LED. + + @param pos position of the click (QPoint) + """ + if self.__on: + print(self.__vcsClean) + vcs = self.project.getVcs() + if vcs: + if self.__vcsClean: + # call log browser dialog + vcs.vcsLogBrowser(self.project.getProjectPath()) + else: + # call status dialog + vcs.vcsStatus(self.project.getProjectPath())
--- a/VCS/VersionControl.py Sun Mar 09 12:16:00 2014 +0100 +++ b/VCS/VersionControl.py Sun Mar 09 17:06:40 2014 +0100 @@ -253,6 +253,19 @@ """ raise RuntimeError('Not implemented') + def vcsLogBrowser(self, name, isFile=False): + """ + Public method used to view the log of a file/directory in the vcs + with a log browser dialog. + + @param name file/directory name to show the log for (string) + @keyparam isFile flag indicating log for a file is to be shown + (boolean) + @exception RuntimeError to indicate that this method must be + implemented by a subclass + """ + raise RuntimeError('Not implemented') + def vcsDiff(self, name): """ Public method used to view the diff of a file/directory in the vcs.
--- a/changelog Sun Mar 09 12:16:00 2014 +0100 +++ b/changelog Sun Mar 09 17:06:40 2014 +0100 @@ -13,6 +13,9 @@ -- extended the plugin repository dialog to allow to hide unwanted entries and cleanup the plugin downloads area - Version Control System Interfaces + -- All + --- made the status LED (right lower corner) clickable (depending on + overall VCS status it will show the log browser or the status dialog) -- Mercurial --- enhanced the tag dialog and extended the log browser to allow tagging of a specific revision