diff --git a/rainbow/SDL20Uword/SDL20Uword.upp b/rainbow/SDL20Uword/SDL20Uword.upp index e5509938c..c756c55ad 100644 --- a/rainbow/SDL20Uword/SDL20Uword.upp +++ b/rainbow/SDL20Uword/SDL20Uword.upp @@ -10,6 +10,5 @@ file help.txt; mainconfig - "" = "GUI SSE2", "" = "GUI SDL20GL"; diff --git a/uppdev/FileSel/main.cpp b/uppdev/FileSel/main.cpp index 25e3fb886..eafe1357f 100644 --- a/uppdev/FileSel/main.cpp +++ b/uppdev/FileSel/main.cpp @@ -7,23 +7,7 @@ GUI_APP_MAIN SetDefaultCharset(CHARSET_UTF8); FileSel fs; String fn; -// fs.BaseDir("U:\\"); - fs - .Type( t_("exe"), "*.exe") //type 1 - .AllFilesType() - .Type( t_("archive FIDE (txt)"), "*.txt") //type 1 - .Type( t_("archive VEG (csv)"), "*.csv;*.veg") //type 2 - .Type( t_("national archive with Fixed Length (txt)"), "*.txt") //type 3 - .Type( t_("archive FSI Italy (csv)"), "*.csv"); //type 4 - fs.DefaultExt("hhh"); - -// fs.NoMkDirOption(); -// fs.Multi(); -// fs.ActiveDir("/usr/include"); -// fs.NoEditFileName(); -// fs.ActiveDir("u:\\"); -// fs.PreSelect("U:/log.txt"); -// fs.ActiveType(3); + fs.AllFilesType(); for(;;) { if(!fs.ExecuteSaveAs()) break; diff --git a/uppsrc/Core/src.tpp/InFilterStream$en-us.tpp b/uppsrc/Core/src.tpp/InFilterStream$en-us.tpp index d9ad34524..60c4a745f 100644 --- a/uppsrc/Core/src.tpp/InFilterStream$en-us.tpp +++ b/uppsrc/Core/src.tpp/InFilterStream$en-us.tpp @@ -16,7 +16,7 @@ topic "InFilterStream"; lic][3 _][*@3;3 Stream]&] [s2;%% Adapter Stream that glues an input stream with some filtering object, typically of compression/decompression class.&] -[s0;i448;a25;kKO9;:noref:@(0.0.255) &] +[s3; &] [ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&] [s3; &] [s5;:InFilterStream`:`:in: [_^Stream^ Stream]_`*[* in]&] diff --git a/uppsrc/Core/src.tpp/OutFilterStream$en-us.tpp b/uppsrc/Core/src.tpp/OutFilterStream$en-us.tpp index cd8d870cb..d81bf0a12 100644 --- a/uppsrc/Core/src.tpp/OutFilterStream$en-us.tpp +++ b/uppsrc/Core/src.tpp/OutFilterStream$en-us.tpp @@ -16,7 +16,7 @@ topic "OutFilterStream"; ublic][3 _][*@3;3 Stream]&] [s2;%% Adapter Stream that glues an input stream with some filtering object, typically of compression/decompression class.&] -[s0;i448;a25;kKO9;:noref:@(0.0.255) &] +[s3; &] [ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&] [s3; &] [s5;:OutFilterStream`:`:Close`(`): [@(0.0.255) virtual] [@(0.0.255) void]_[* Close]()&] diff --git a/uppsrc/CtrlLib/ColumnList.cpp b/uppsrc/CtrlLib/ColumnList.cpp index b3135784f..7f82c7dc9 100644 --- a/uppsrc/CtrlLib/ColumnList.cpp +++ b/uppsrc/CtrlLib/ColumnList.cpp @@ -249,7 +249,7 @@ dword ColumnList::SwapKey(dword key) bool ColumnList::Key(dword _key, int count) { int c = cursor; - bool sel = _key & K_SHIFT; + bool sel = (_key & K_SHIFT) && multi; int key = _key & ~K_SHIFT; key = SwapKey(key); switch(key) { diff --git a/uppsrc/ide/idefile.cpp b/uppsrc/ide/idefile.cpp index c36dffb86..8f4cdaa16 100644 --- a/uppsrc/ide/idefile.cpp +++ b/uppsrc/ide/idefile.cpp @@ -730,10 +730,17 @@ void Ide::ReloadFile() void Ide::EditAnyFile() { FileSel& fs = AnySourceFs(); +#if 0 fs.Multi(false); if(!fs.ExecuteOpen()) return; EditFile(fs); FileSelected(); +#endif + if(fs.ExecuteOpen()) + for(int i = 0; i < fs.GetCount(); i++) { + EditFile(fs[i]); + FileSelected(); + } } void Ide::DragAndDrop(Point, PasteClip& d) diff --git a/upptst/FileSel/main.cpp b/upptst/FileSel/main.cpp index 6d070135c..1daf111f0 100644 --- a/upptst/FileSel/main.cpp +++ b/upptst/FileSel/main.cpp @@ -8,6 +8,8 @@ GUI_APP_MAIN sel.AllFilesType(); sel.Type("Test2", "*.tst"); sel.ActiveType(1); + for(int i = 0; i < sel.GetCount(); i++) + DDUMP(sel[i]); sel.Multi(); if(!sel.ExecuteSaveAs("Test!")) return;