github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: svn issue fixed #481

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6145 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-06-13 06:37:44 +00:00
parent 6f3f9cb28f
commit fd411a083b
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/ide/ide.h
View file

@ -823,7 +823,7 @@ public:
void LoadAbbr();
void SaveAbbr();
Vector<String> SvnDirs();
Vector<String> SvnDirs(bool actual = false);
void File(Bar& menu);
void EditWorkspace();

7
uppsrc/ide/idebar.cpp
View file

@ -327,10 +327,7 @@ void Ide::Setup(Bar& menu) {
void Ide::ProjectSvn(Bar& menu)
{
Vector<String> w = SvnDirs();
String p = GetFileFolder(PackagePath(actualpackage));
if(IsSvnDir(p))
w.Insert(0, p);
Vector<String> w = SvnDirs(true);
for(int i = 0; i < w.GetCount(); i++)
menu.Add("Synchronize " + w[i], IdeImg::svn_dir(), THISBACK1(SyncSvnDir, w[i]));
menu.Add("Synchronize everything..", IdeImg::svn(), THISBACK(SyncSvn));
@ -365,7 +362,7 @@ void Ide::Project(Bar& menu) {
if(OldLang())
menu.Add("Convert s_ -> t_", THISBACK(ConvertST));
FilePropertiesMenu(menu);
if(SvnDirs().GetCount())
if(SvnDirs(true).GetCount())
if(menu.IsMenuBar())
menu.Add("SVN", THISBACK(ProjectSvn));
else

10
uppsrc/ide/idetool.cpp
View file

@ -311,9 +311,11 @@ void Ide::Times()
while(statdlg.Run() == IDRETRY);
}
Vector<String> Ide::SvnDirs()
Vector<String> Ide::SvnDirs(bool actual)
{
Vector<String> d = GetUppDirs();
if (actual && !IsAux())
d.Insert(0, GetFileFolder(PackagePath(actualpackage)));
Vector<String> r;
for(int i = 0; i < d.GetCount(); i++)
if(IsSvnDir(d[i]))
@ -350,7 +352,11 @@ void Ide::SyncSvnDirs(const Vector<String>& working)
void Ide::SyncSvn()
{
SyncSvnDirs(SvnDirs());
Vector<String> d = SvnDirs();
if(d.GetCount())
SyncSvnDirs(d);
else
SyncSvnDirs(SvnDirs(true));
}
void Ide::SyncSvnDir(const String& working)