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

usvn Changes button, NOWIN98 removed from MscBuilder

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1025 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-03-30 10:41:28 +00:00
parent 3a116f24bb
commit 720d4a8b10
4 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/ide/Builders/MscBuilder.cpp
View file

@ -485,7 +485,7 @@ bool MscBuilder::Link(const Vector<String>& linkfile, const String& linkoptions,
if(HasAnyDebug())
link << " -incremental:yes -debug -OPT:NOREF";
else
link << " -incremental:no -release -OPT:REF,ICF,NOWIN98";
link << " -incremental:no -release -OPT:REF,ICF";
if(IsMscArm())
link << " -subsystem:windowsce,4.20 /ARMPADCODE -NODEFAULTLIB:\"oldnames.lib\" ";
else

2
uppsrc/ide/Debuggers/Dbg.cpp
View file

@ -132,7 +132,7 @@ String Dbg::FastCmd(const char *command)
bool lock = false;
if(command) {
LLOG("FastCmd: " << command);
dbg->Write(String(command) + "\n"); // TRC 04/10/20: must not use \r\n as LINUX hates it
dbg->Write(String(command) + "\n");
PutVerbose(command);
}
String result;

32
uppsrc/usvn/SvnSync.cpp
View file

@ -7,12 +7,14 @@ SvnSync::SvnSync()
list.AddIndex();
list.AddColumn("Action");
list.AddColumn("Path");
list.ColumnWidths("170 600");
list.AddColumn("Changes");
list.ColumnWidths("170 500 100");
list.NoCursor().EvenRowColor();
list.SetLineCy(max(Draw::GetStdFontCy(), 20));
list.WhenLeftClick = THISBACK(Diff);
Sizeable().Zoomable();
setup <<= THISBACK(Setup);
BackPaint();
}
void SvnSync::Setup()
@ -34,7 +36,8 @@ void SvnSync::SyncList()
String path = GetFullPath(w.working);
list.Add(REPOSITORY, path,
AttrText("Working directory").SetFont(StdFont().Bold()).Ink(White).Paper(Blue),
AttrText(path).SetFont(Arial(20).Bold()).Paper(Blue).Ink(White));
AttrText(path).SetFont(Arial(20).Bold()).Paper(Blue).Ink(White),
AttrText("").SetFont(Arial(20).Bold()).Paper(Blue).Ink(White));
list.SetLineCy(list.GetCount() - 1, 26);
Vector<String> ln = Split(Sys("svn status " + path), CharFilterCrLf);
bool actions = false;
@ -87,8 +90,12 @@ void SvnSync::SyncList()
list.Add(action, file,
action < 0 ? Value(AttrText(an).Ink(color)) : Value(true),
AttrText(" " + file.Mid(path.GetCount() + 1)).Ink(color));
if(action >= 0)
if(action >= 0) {
list.SetCtrl(ii, 0, revert.Add().SetLabel("Revert\n" + an).NoWantFocus());
Ctrl& b = diff.Add().SetLabel("Changes..").SizePos().NoWantFocus();
b <<= THISBACK1(DoDiff, ii);
list.SetCtrl(ii, 2, b);
}
}
}
}
@ -108,14 +115,18 @@ void SvnSync::SyncList()
}
}
void SvnSync::DoDiff(int ii)
{
String f = list.Get(ii, 1);
if(!IsNull(f))
RunSvnDiff(f);
}
void SvnSync::Diff()
{
int cr = list.GetClickRow();
if(cr >= 0) {
String f = list.Get(cr, 1);
if(!IsNull(f))
RunSvnDiff(f);
}
if(cr >= 0)
DoDiff(cr);
}
#ifdef PLATFORM_WIN32
@ -326,11 +337,6 @@ bool IsSvnDir(const String& p)
#ifdef flagMAIN
GUI_APP_MAIN
{
// SvnSel svn;
// svn.Select();
// svn.Select("svn://10.0.0.19/upp", "", "");
// return;
SvnSync ss;
String mp = ConfigFile("usvn.msg");
ss.SetMsgs(LoadFromFile(mp));

2
uppsrc/usvn/usvn.h
View file

@ -109,12 +109,14 @@ struct SvnSync : WithSvnSyncLayout<TopWindow> {
Array<Switch> revert;
Array<EditString> message;
Array<Button> diff;
ArrayMap<String, String> msgmap;
SvnWorks works;
void SyncList();
void Setup();
void DoDiff(int ii);
void Diff();
typedef SvnSync CLASSNAME;