github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

theide: Import directory source tree into package

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1314 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-06-15 20:24:16 +00:00
parent ce69d1e4d4
commit 43bc638dd6
3 changed files with 87 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/ide/UppDlg.h
View file

@ -210,6 +210,8 @@ struct WorkspaceWork {
void AddItem(const String& name, bool separator, bool readonly);
void AddTopicGroup();
void AddSeparator();
void Import();
void DoImport(const String& dir, const String& mask, bool sep, Progress& pi);
void RemoveFile();
void DelFile();
void RenameFile();

77
uppsrc/ide/UppWspc.cpp
View file

@ -329,6 +329,79 @@ void WorkspaceWork::AddSeparator()
AddItem(~name, true, true);
}
class ImportDlg : public WithImportLayout<TopWindow> {
typedef ImportDlg CLASSNAME;
FrameRight<Button> dir;
void SetFolder();
public:
ImportDlg();
};
void ImportDlg::SetFolder()
{
if(!AnySourceFs().ExecuteSelectDir()) return;
folder <<= ~AnySourceFs();
}
ImportDlg::ImportDlg()
{
CtrlLayoutOKCancel(*this, "Import directory tree into package");
folder.AddFrame(dir);
dir <<= THISBACK(SetFolder);
dir.SetImage(CtrlImg::smallright()).NoWantFocus();
files <<= "*.cpp *.h *.hpp *.c *.C *.cxx *.cc";
}
void WorkspaceWork::DoImport(const String& dir, const String& mask, bool sep, Progress& pi)
{
String active = GetActivePackage();
if(active.IsEmpty()) return;
FindFile ff(AppendFileName(dir, "*.*"));
while(ff) {
String ft = ff.GetName();
String p = AppendFileName(dir, ft);
if(ff.IsFile()) {
if(ff.IsFile() && PatternMatchMulti(mask, ff.GetName())) {
if(pi.StepCanceled()) return;
if(sep) {
Package::File& f = actual.file.Add();
f = GetFileName(dir);
f.separator = f.readonly = true;
sep = false;
}
SaveFile(PackagePath(ft), LoadFile(p));
Package::File& f = actual.file.Add();
f = ft;
f.separator = f.readonly = false;
}
}
if(ff.IsFolder())
DoImport(p, mask, true, pi);
ff.Next();
}
}
void WorkspaceWork::Import()
{
String active = GetActivePackage();
if(active.IsEmpty()) return;
ImportDlg dlg;
if(dlg.Execute() != IDOK)
return;
Progress pi("Importing file %d");
int fci = filelist.GetCursor();
int cs = filelist.GetSbPos();
int ci = fci >= 0 && fci < fileindex.GetCount() ? fileindex[fci] : -1;
DoImport(~dlg.folder, ~dlg.files, false, pi);
SaveLoadPackage();
filelist.SetSbPos(cs);
filelist.SetCursor(fci >= 0 ? fci : filelist.GetCount() - 1);
FileSelected();
}
String TppName(const String& s)
{
if(s == "src")
@ -572,8 +645,9 @@ bool WorkspaceWork::IsAux()
return actualpackage == tempaux || actualpackage == prjaux || actualpackage == ideaux || actualpackage == METAPACKAGE;
}
void WorkspaceWork::SpecialFileMenu(Bar& bar)
void WorkspaceWork::SpecialFileMenu(Bar& menu)
{
bool isaux = IsAux();
menu.Add("Insert any file(s)", THISBACK1(AddFile, ANY_FILE))
.Key(K_SHIFT|K_CTRL_I)
.Help("Insert files from anywhere on disk (discouraged in portable packages)");
@ -585,6 +659,7 @@ void WorkspaceWork::SpecialFileMenu(Bar& bar)
menu.Add("Insert home directory file(s)", THISBACK1(AddFile, HOME_FILE))
.Help("Open file selector in current user's HOME directory");
#endif
menu.Add("Import directory tree sources..", THISBACK(Import));
}
void WorkspaceWork::FileMenu(Bar& menu)

9
uppsrc/ide/ide.lay
View file

@ -582,3 +582,12 @@ LAYOUT(AbbreviationsLayout, 664, 476)
ITEM(Label, dv___7, SetLabel(t_("Use '@' character to place the caret.")).LeftPosZ(116, 304).TopPosZ(416, 19))
END_LAYOUT
LAYOUT(ImportLayout, 400, 92)
ITEM(Label, dv___0, SetLabel(t_("Source folder")).LeftPosZ(8, 72).TopPosZ(8, 19))
ITEM(EditString, folder, LeftPosZ(80, 312).TopPosZ(8, 19))
ITEM(Label, dv___2, SetLabel(t_("Import files")).LeftPosZ(8, 72).TopPosZ(32, 19))
ITEM(EditString, files, LeftPosZ(80, 312).TopPosZ(32, 19))
ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(260, 64).TopPosZ(60, 24))
ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(328, 64).TopPosZ(60, 24))
END_LAYOUT