mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-11 22:03:01 -06:00
theide: svn sync dirs in initial Select package dialog (right-click menu on assembly)
git-svn-id: svn://ultimatepp.org/upp/trunk@798 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl
parent
505c0af59b
commit
34cce65e1d
6 changed files with 72 additions and 30 deletions
|
|
@ -104,7 +104,6 @@ inline bool PackageLess(String a, String b)
|
|||
return a < b;
|
||||
};
|
||||
|
||||
|
||||
struct SelectPackageDlg : public WithListLayout<TopWindow> {
|
||||
virtual bool Key(dword key, int count);
|
||||
|
||||
|
|
@ -162,6 +161,10 @@ struct SelectPackageDlg : public WithListLayout<TopWindow> {
|
|||
void SyncBase(String initvars);
|
||||
void SyncList();
|
||||
static bool Pless(const SelectPackageDlg::PkInfo& a, const SelectPackageDlg::PkInfo& b);
|
||||
|
||||
Vector<String> GetSvnDirs();
|
||||
void SyncSvnDir(const String& dir);
|
||||
void SyncSvnDirs();
|
||||
};
|
||||
|
||||
bool SelectPackageDlg::Key(dword key, int count)
|
||||
|
|
@ -267,7 +270,7 @@ SelectPackageDlg::SelectPackageDlg(const char *title, bool selectvars_, bool mai
|
|||
all = !main;
|
||||
progress.Hide();
|
||||
brief <<= THISBACK(SyncBrief);
|
||||
search.NullText("Search", StdFont().Italic(), SColorDisabled());
|
||||
search.NullText("Search (Ctrl+Q)", StdFont().Italic(), SColorDisabled());
|
||||
search <<= THISBACK(SyncList);
|
||||
search.SetFilter(CharFilterDefaultToUpperAscii);
|
||||
SyncBrief();
|
||||
|
|
@ -345,6 +348,30 @@ void SelectPackageDlg::OnNew() {
|
|||
StoreToGlobal(dlg, "NewPackage");
|
||||
}
|
||||
|
||||
Vector<String> SelectPackageDlg::GetSvnDirs()
|
||||
{
|
||||
Vector<String> r;
|
||||
Vector<String> dirs = SplitDirs(GetVar("UPP"));
|
||||
for(int i = 0; i < dirs.GetCount(); i++) {
|
||||
String d = NormalizePath(dirs[i]);
|
||||
if(IsSvnDir(d))
|
||||
r.Add(d);
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
void SelectPackageDlg::SyncSvnDir(const String& dir)
|
||||
{
|
||||
SvnSyncDirs(Vector<String>() << dir);
|
||||
Load();
|
||||
}
|
||||
|
||||
void SelectPackageDlg::SyncSvnDirs()
|
||||
{
|
||||
SvnSyncDirs(GetSvnDirs());
|
||||
Load();
|
||||
}
|
||||
|
||||
void SelectPackageDlg::ToolBase(Bar& bar)
|
||||
{
|
||||
bar.Add("New assembly", THISBACK(OnBaseAdd))
|
||||
|
|
@ -353,6 +380,13 @@ void SelectPackageDlg::ToolBase(Bar& bar)
|
|||
.Key(K_CTRL_ENTER);
|
||||
bar.Add(base.IsCursor(), "Remove assembly", THISBACK(OnBaseRemove))
|
||||
.Key(K_CTRL_DELETE);
|
||||
Vector<String> d = GetSvnDirs();
|
||||
if(d.GetCount()) {
|
||||
bar.Separator();
|
||||
for(int i = 0; i < d.GetCount(); i++)
|
||||
bar.Add("Synchronize " + d[i], IdeImg::svn_dir(), THISBACK1(SyncSvnDir, d[i]));
|
||||
bar.Add("Synchronize everything..", IdeImg::svn(), THISBACK(SyncSvnDirs));
|
||||
}
|
||||
}
|
||||
|
||||
void SelectPackageDlg::OnBaseAdd()
|
||||
|
|
@ -395,8 +429,7 @@ void SelectPackageDlg::OnBaseRemove()
|
|||
void SelectPackageDlg::Load()
|
||||
{
|
||||
update = msecs();
|
||||
if(selectvars)
|
||||
{
|
||||
if(selectvars) {
|
||||
list.Enable(base.IsCursor());
|
||||
if(!base.IsCursor())
|
||||
return;
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
|
|
@ -490,6 +490,7 @@ struct AssistEditor : CodeEditor {
|
|||
|
||||
void DirSel(EditField& f, FrameRight<Button>& b);
|
||||
bool CopyFolder(const char *dst, const char *src, Progress *pi);
|
||||
void SvnSyncDirs(const Vector<String>& working);
|
||||
|
||||
struct Ide : public TopWindow, public WorkspaceWork, public IdeContext {
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ IMAGE_ID(show)
|
|||
IMAGE_ID(tpp_pen)
|
||||
IMAGE_ID(tpp_doc)
|
||||
IMAGE_ID(svn)
|
||||
IMAGE_ID(svn_dir)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,152,77,210,155,48,12,134,125,129,206,124,187,206,116,213,235,244,84,229,68,61,67,206,145,35,116,217,46,187)
|
||||
|
|
@ -3859,26 +3860,28 @@ IMAGE_DATA(25,114,248,31,15,161,22,99,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|||
IMAGE_END_DATA(5568, 20)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,152,207,107,146,113,28,199,223,41,214,156,25,58,33,40,214,178,203,70,22,6,121,201,58,108,82,52,34,237)
|
||||
IMAGE_DATA(22,52,6,65,169,155,27,75,217,14,107,34,75,89,108,56,72,232,150,3,7,94,50,240,218,63,48,104,183,239,97,176)
|
||||
IMAGE_DATA(78,222,212,203,14,117,107,7,61,61,125,191,207,163,143,191,158,199,199,231,121,164,95,244,150,247,225,249,240,126,125,63)
|
||||
IMAGE_DATA(223,31,62,95,68,216,96,195,48,181,186,91,224,180,184,157,231,56,116,184,88,44,114,253,36,201,159,80,167,169,87,91)
|
||||
IMAGE_DATA(124,50,153,20,221,124,150,228,25,59,71,237,234,228,85,245,103,189,125,189,188,212,28,36,251,179,222,121,141,235,79,55)
|
||||
IMAGE_DATA(120,54,143,35,13,235,119,161,229,188,134,254,62,161,47,207,159,244,242,221,243,232,225,143,218,246,79,235,249,251,26,99)
|
||||
IMAGE_DATA(112,26,207,223,213,88,131,150,254,249,182,253,151,232,223,189,15,221,188,158,247,71,151,134,125,25,80,113,26,45,242,106)
|
||||
IMAGE_DATA(37,197,163,241,97,242,120,60,178,30,132,215,219,95,200,164,68,15,194,235,93,127,83,253,214,253,43,250,107,225,117,126)
|
||||
IMAGE_DATA(127,186,37,55,254,160,210,195,203,101,7,29,67,47,175,78,231,135,127,25,252,110,61,238,99,233,124,42,213,235,255,249)
|
||||
IMAGE_DATA(86,94,221,126,26,100,234,127,190,254,193,151,161,8,233,155,179,40,147,231,220,155,155,36,148,205,146,233,237,109,98,139)
|
||||
IMAGE_DATA(70,137,113,113,145,64,254,230,225,88,246,243,193,1,121,181,191,79,110,82,118,100,121,185,111,126,102,103,135,207,250,51)
|
||||
IMAGE_DATA(25,50,21,143,19,179,66,222,78,231,112,139,142,123,61,145,32,151,214,214,200,217,165,165,190,121,83,36,66,24,51,22)
|
||||
IMAGE_DATA(139,17,203,202,138,226,252,177,176,192,103,152,13,44,75,159,251,228,213,238,231,223,43,27,46,72,214,175,2,223,67,236)
|
||||
IMAGE_DATA(224,169,3,194,226,95,0,161,144,96,183,91,105,220,39,148,231,216,79,6,234,47,34,127,124,12,148,74,64,165,2,100)
|
||||
IMAGE_DATA(179,128,213,170,142,103,178,219,129,104,20,56,61,5,10,5,57,222,8,236,141,2,31,153,71,168,105,105,186,51,225,245)
|
||||
IMAGE_DATA(2,213,42,176,181,213,81,54,192,4,7,174,225,204,32,55,92,46,7,148,203,192,248,184,88,122,128,56,222,211,249,122)
|
||||
IMAGE_DATA(17,86,230,29,14,97,137,147,147,252,99,0,187,200,160,206,243,239,80,195,125,172,203,179,179,179,192,252,188,192,71,34)
|
||||
IMAGE_DATA(20,14,224,6,252,184,135,8,207,223,198,28,166,240,80,158,95,167,99,215,106,2,95,175,3,233,52,95,190,72,41,198)
|
||||
IMAGE_DATA(143,98,76,121,254,225,176,192,111,108,136,37,27,174,224,13,202,120,134,156,50,111,160,123,236,116,2,38,83,71,249,17)
|
||||
IMAGE_DATA(222,34,133,42,156,184,219,5,204,192,108,46,192,98,17,108,52,238,201,14,253,28,159,232,110,254,160,167,30,131,89,188)
|
||||
IMAGE_DATA(241,95,226,240,176,245,111,68,32,240,77,150,63,7,43,158,226,3,146,168,32,129,18,94,227,171,42,190,169,203,112,227)
|
||||
IMAGE_DATA(14,130,188,25,239,247,115,8,6,5,79,76,116,240,63,1,157,183,215,223,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(704, 5)
|
||||
IMAGE_DATA(120,156,237,152,207,75,27,81,16,199,191,77,72,107,180,41,137,66,161,197,218,244,162,84,75,10,245,82,219,131,134,150)
|
||||
IMAGE_DATA(74,105,210,91,161,34,20,90,163,70,177,9,122,176,138,216,44,22,37,66,3,189,53,130,130,151,166,144,107,255,1,161)
|
||||
IMAGE_DATA(222,222,65,176,167,220,140,23,15,237,173,30,244,180,125,111,55,217,236,38,251,246,103,232,47,156,240,61,236,48,159,153)
|
||||
IMAGE_DATA(55,179,153,71,20,65,4,209,76,155,93,47,136,78,164,230,69,17,26,21,139,69,209,200,116,249,35,170,44,213,108,141)
|
||||
IMAGE_DATA(207,100,50,138,170,207,186,60,99,71,168,122,181,188,173,250,172,118,180,145,215,59,131,110,125,86,123,219,97,255,217,10)
|
||||
IMAGE_DATA(207,206,177,231,160,255,94,212,180,237,160,126,84,174,43,241,71,141,124,253,57,26,248,61,213,252,156,190,255,104,37,135)
|
||||
IMAGE_DATA(232,240,253,247,86,122,112,82,127,91,53,127,157,250,245,115,168,231,221,236,143,43,107,246,101,64,77,116,40,133,183,107)
|
||||
IMAGE_DATA(122,60,42,31,102,253,253,253,92,89,225,221,214,151,99,4,69,86,120,183,253,87,205,168,239,223,81,223,9,239,242,251)
|
||||
IMAGE_DATA(83,111,188,252,86,205,13,207,139,181,154,195,45,111,207,46,54,255,50,248,211,246,196,64,250,241,130,208,168,179,248,90)
|
||||
IMAGE_DATA(188,189,121,122,56,254,191,223,254,195,101,40,66,255,230,44,114,226,197,200,242,50,73,228,243,100,112,117,149,4,83,41)
|
||||
IMAGE_DATA(226,157,156,36,224,223,60,34,139,253,178,179,67,94,111,109,145,91,148,109,153,158,54,140,31,90,91,147,98,99,185,28)
|
||||
IMAGE_DATA(233,89,92,36,126,147,248,16,61,195,109,154,247,230,210,18,185,50,55,71,206,79,77,25,198,251,146,73,194,152,246,116)
|
||||
IMAGE_DATA(154,180,205,204,152,158,31,19,19,82,12,147,135,197,210,103,131,120,187,243,252,119,45,136,75,186,254,235,192,143,4,123)
|
||||
IMAGE_DATA(241,84,113,185,249,151,64,34,33,43,18,49,203,251,148,242,34,251,201,64,245,85,225,247,247,129,82,9,40,151,129,124)
|
||||
IMAGE_DATA(30,8,4,236,241,204,66,33,32,149,2,142,143,129,66,129,199,123,129,141,86,224,19,83,11,21,117,13,106,35,6,6)
|
||||
IMAGE_DATA(128,195,67,96,101,69,227,246,192,135,14,220,192,57,43,55,220,230,38,112,112,0,116,118,42,174,135,88,196,7,122,222)
|
||||
IMAGE_DATA(1,140,155,243,29,29,114,139,221,221,210,99,28,235,200,225,84,226,223,227,4,15,48,207,103,135,135,129,209,81,153,79)
|
||||
IMAGE_DATA(38,41,28,71,31,98,184,143,164,196,223,193,8,122,240,136,207,207,211,220,39,39,50,127,122,10,100,179,146,251,50,165)
|
||||
IMAGE_DATA(24,223,138,118,243,243,143,143,203,252,194,130,226,10,226,26,222,226,0,207,177,105,206,123,232,140,195,97,192,231,211,184)
|
||||
IMAGE_DATA(31,227,29,4,28,34,140,123,117,192,16,252,254,2,218,218,100,121,189,27,220,212,47,240,153,78,243,39,125,235,105,248)
|
||||
IMAGE_DATA(149,27,255,21,118,119,107,255,141,136,199,191,115,249,11,8,224,25,62,34,131,50,150,80,194,27,124,179,197,87,237,42)
|
||||
IMAGE_DATA(34,184,139,49,73,140,143,197,68,140,141,201,234,234,210,242,103,203,104,190,140,130,0,145,169,177,138,249,50,50,174,250)
|
||||
IMAGE_DATA(135,124,53,79,45,151,249,50,170,25,117,30,171,203,168,230,180,188,181,101,228,243,204,172,45,163,186,7,237,28,207,150)
|
||||
IMAGE_DATA(81,29,250,11,232,31,153,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(768, 6)
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ void Ide::ProjectSvn(Bar& menu)
|
|||
if(IsSvnDir(p))
|
||||
w.Insert(0, p);
|
||||
for(int i = 0; i < w.GetCount(); i++)
|
||||
menu.Add("Synchronize " + w[i], THISBACK1(SyncSvnDir, w[i]));
|
||||
menu.Add("Synchronize " + w[i], IdeImg::svn_dir(), THISBACK1(SyncSvnDir, w[i]));
|
||||
menu.Add("Synchronize everything..", IdeImg::svn(), THISBACK(SyncSvn));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -309,9 +309,8 @@ INITBLOCK {
|
|||
RegisterGlobalConfig("svn-msgs");
|
||||
}
|
||||
|
||||
void Ide::SyncSvnDirs(const Vector<String>& working)
|
||||
void SvnSyncDirs(const Vector<String>& working)
|
||||
{
|
||||
SaveFile();
|
||||
SvnSync svn;
|
||||
String msgs;
|
||||
LoadFromGlobal(msgs, "svn-msgs");
|
||||
|
|
@ -323,6 +322,12 @@ void Ide::SyncSvnDirs(const Vector<String>& working)
|
|||
StoreToGlobal(msgs, "svn-msgs");
|
||||
}
|
||||
|
||||
void Ide::SyncSvnDirs(const Vector<String>& working)
|
||||
{
|
||||
SaveFile();
|
||||
SvnSyncDirs(working);
|
||||
}
|
||||
|
||||
void Ide::SyncSvn()
|
||||
{
|
||||
SyncSvnDirs(SvnDirs());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue