mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-09-10 03:54:54 -06:00
CtrlLib, Core, Win32: FileSel now has Win32 network browsing support
git-svn-id: svn://ultimatepp.org/upp/trunk@1860 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl
parent
9b2081ec7c
commit
e1db44517c
6 changed files with 242 additions and 68 deletions
|
|
@ -103,6 +103,26 @@ Array<NetNode> NetNode::Enum0(HANDLE hEnum)
|
|||
return r;
|
||||
}
|
||||
|
||||
int NetNode::GetDisplayType() const
|
||||
{
|
||||
switch(net.dwDisplayType) {
|
||||
case RESOURCEDISPLAYTYPE_NETWORK:
|
||||
return NETWORK;
|
||||
case RESOURCEDISPLAYTYPE_DOMAIN:
|
||||
case RESOURCEDISPLAYTYPE_GROUP:
|
||||
case RESOURCEDISPLAYTYPE_TREE:
|
||||
case RESOURCEDISPLAYTYPE_NDSCONTAINER:
|
||||
return GROUP;
|
||||
case RESOURCEDISPLAYTYPE_SERVER:
|
||||
return SERVER;
|
||||
case RESOURCEDISPLAYTYPE_SHARE:
|
||||
case RESOURCEDISPLAYTYPE_SHAREADMIN:
|
||||
case RESOURCEDISPLAYTYPE_DIRECTORY:
|
||||
return SHARE;
|
||||
}
|
||||
return UNKNOWN;
|
||||
}
|
||||
|
||||
END_UPP_NAMESPACE
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -277,8 +277,12 @@ class NetNode : Moveable<NetNode> {
|
|||
void SetPtrs();
|
||||
|
||||
public:
|
||||
enum {
|
||||
UNKNOWN, NETWORK, GROUP, SERVER, SHARE
|
||||
};
|
||||
String GetName() const { return name; }
|
||||
String GetPath() const { return path; }
|
||||
int GetDisplayType() const;
|
||||
Array<NetNode> Enum() const;
|
||||
|
||||
void Serialize(Stream& s);
|
||||
|
|
|
|||
|
|
@ -59,6 +59,8 @@ IMAGE_ID(Hd)
|
|||
IMAGE_ID(CdRom)
|
||||
IMAGE_ID(Computer)
|
||||
IMAGE_ID(Network)
|
||||
IMAGE_ID(Share)
|
||||
IMAGE_ID(Group)
|
||||
IMAGE_ID(Var)
|
||||
IMAGE_ID(Home)
|
||||
IMAGE_ID(MenuCheck1)
|
||||
|
|
@ -228,66 +230,95 @@ IMAGE_DATA(63,156,157,189,191,35,249,1,177,42,192,112,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|||
IMAGE_END_DATA(800, 24)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,91,203,145,219,48,12,101,18,79,254,201,108,110,169,33,197,228,154,113,15,41,66,5,164,128,20,145,30,236)
|
||||
IMAGE_DATA(2,82,65,102,175,190,238,33,13,40,210,218,212,66,212,3,8,240,99,201,19,66,131,89,155,196,3,64,18,4,104,73)
|
||||
IMAGE_DATA(235,238,220,157,235,123,183,85,234,35,44,98,99,20,209,113,145,193,124,60,30,255,11,252,40,199,177,128,143,173,155,180)
|
||||
IMAGE_DATA(142,209,117,139,172,99,212,111,202,93,215,65,252,216,174,101,52,134,140,241,175,71,99,50,168,64,87,11,6,16,148,69)
|
||||
IMAGE_DATA(130,225,150,241,190,125,99,193,220,239,247,251,156,224,207,193,107,125,102,199,24,36,64,200,163,127,136,61,62,38,43,233)
|
||||
IMAGE_DATA(86,114,222,248,55,122,50,200,201,158,154,234,97,181,109,76,102,150,132,182,208,49,181,35,126,210,127,230,174,195,248,152)
|
||||
IMAGE_DATA(207,26,124,47,176,215,81,203,126,238,248,57,124,200,24,127,110,215,50,138,129,140,248,89,143,206,39,131,103,215,48,149)
|
||||
IMAGE_DATA(51,232,222,225,10,166,199,122,54,38,150,25,214,166,3,99,117,58,100,172,172,163,68,69,153,54,132,244,87,24,195,76)
|
||||
IMAGE_DATA(214,185,110,226,121,59,143,159,219,121,194,175,97,63,101,252,6,222,14,141,201,224,185,123,81,76,159,229,120,234,249,82)
|
||||
IMAGE_DATA(73,38,252,233,116,50,241,45,226,119,187,93,50,126,196,106,241,84,142,98,45,120,47,139,176,90,60,135,213,140,95,194)
|
||||
IMAGE_DATA(106,231,143,195,110,45,126,150,39,71,29,165,236,213,5,181,100,208,240,13,191,29,252,234,201,160,81,163,70,141,110,34)
|
||||
IMAGE_DATA(25,128,187,223,38,92,120,247,93,163,135,226,104,22,7,143,215,68,60,87,13,36,124,12,75,117,160,170,112,235,120,237)
|
||||
IMAGE_DATA(252,73,21,145,91,63,58,247,177,138,202,61,193,177,86,227,42,85,188,6,181,100,192,99,75,37,131,208,127,75,50,240)
|
||||
IMAGE_DATA(63,163,70,162,254,107,55,163,199,83,236,32,98,194,131,121,51,225,67,108,12,143,116,56,114,211,173,37,131,74,244,206)
|
||||
IMAGE_DATA(189,165,95,107,60,18,161,178,8,39,245,107,251,144,255,156,13,171,108,170,127,154,126,142,108,235,240,126,184,12,202,52)
|
||||
IMAGE_DATA(198,209,231,107,201,75,129,150,19,136,20,111,149,183,248,131,116,160,207,146,205,218,242,188,191,82,48,89,211,26,149,89)
|
||||
IMAGE_DATA(67,62,244,55,148,151,250,53,182,115,74,130,198,31,235,120,215,144,23,231,238,165,123,179,192,32,61,14,71,99,255,225)
|
||||
IMAGE_DATA(208,163,190,199,118,208,55,181,7,125,162,60,210,207,248,131,253,255,60,92,145,1,150,36,107,10,51,235,191,172,100,45)
|
||||
IMAGE_DATA(27,52,90,106,216,8,35,178,180,13,180,75,57,27,41,229,138,203,18,225,57,162,239,127,127,131,28,177,133,211,208,197)
|
||||
IMAGE_DATA(134,70,39,211,30,213,207,217,120,108,35,204,201,104,244,35,27,26,253,116,44,194,252,107,230,129,157,175,80,255,226,179)
|
||||
IMAGE_DATA(48,207,139,241,132,175,91,5,250,195,249,154,244,82,36,99,51,166,159,91,111,164,255,220,70,46,197,252,112,49,139,230)
|
||||
IMAGE_DATA(159,211,47,196,15,162,104,124,114,107,34,248,204,142,97,154,227,180,253,171,26,131,111,99,56,149,66,253,165,169,118,109)
|
||||
IMAGE_DATA(107,84,155,62,14,151,240,10,66,202,2,135,9,101,171,56,231,112,2,86,99,115,112,205,102,21,155,206,149,76,74,159)
|
||||
IMAGE_DATA(134,235,245,112,137,214,240,233,67,69,94,62,245,22,38,197,58,80,57,98,183,81,61,222,45,39,45,252,140,254,67,40)
|
||||
IMAGE_DATA(196,47,212,71,236,21,209,17,193,179,68,113,21,116,196,170,247,236,244,87,209,143,36,29,232,59,240,95,196,151,210,65)
|
||||
IMAGE_DATA(219,193,158,152,217,82,140,125,177,191,40,5,123,73,162,217,254,10,30,55,217,11,152,246,196,119,11,207,2,35,148,123)
|
||||
IMAGE_DATA(172,157,126,18,166,226,31,50,241,127,50,241,191,50,241,63,51,241,63,50,241,223,51,241,95,51,241,95,50,241,110,93)
|
||||
IMAGE_DATA(124,57,122,21,36,3,244,126,175,111,191,191,191,159,101,186,241,59,125,7,248,112,248,59,113,248,126,240,216,230,58,215)
|
||||
IMAGE_DATA(250,64,31,154,51,58,183,104,45,80,251,63,223,249,107,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(928, 18)
|
||||
IMAGE_DATA(120,156,237,91,93,76,20,87,20,30,150,229,103,89,69,22,169,64,156,229,87,22,148,34,191,178,150,127,148,31,21,21)
|
||||
IMAGE_DATA(1,5,197,22,40,134,244,199,164,150,52,74,12,85,215,166,164,173,33,105,90,125,209,244,193,167,250,90,31,26,181,125)
|
||||
IMAGE_DATA(208,190,208,54,33,125,104,211,248,210,164,198,196,164,105,31,218,106,90,27,165,156,222,217,101,240,238,236,253,157,217,225)
|
||||
IMAGE_DATA(39,221,51,57,217,217,123,207,119,206,185,231,220,123,238,221,97,80,210,148,52,5,64,89,169,4,28,102,98,121,196,209)
|
||||
IMAGE_DATA(177,32,67,230,59,119,238,252,47,240,154,28,141,25,120,94,222,88,121,228,230,141,147,71,174,223,56,7,2,1,34,94)
|
||||
IMAGE_DATA(107,23,101,210,24,44,140,127,249,72,43,6,52,138,139,139,75,66,31,78,237,62,37,37,165,218,227,241,28,20,84,235)
|
||||
IMAGE_DATA(64,216,228,244,244,244,93,91,43,202,110,108,111,171,122,84,216,158,254,207,150,61,45,80,215,253,58,108,171,219,241,83)
|
||||
IMAGE_DATA(86,86,246,36,13,28,31,31,159,238,243,249,46,181,31,62,1,254,145,1,200,233,115,130,122,48,14,212,145,118,80,223)
|
||||
IMAGE_DATA(186,5,222,147,63,66,222,232,141,71,91,170,91,110,38,37,37,21,233,62,234,180,169,164,236,146,127,244,242,92,249,153)
|
||||
IMAGE_DATA(123,144,123,226,34,168,3,110,80,15,41,65,29,222,62,7,250,190,30,212,161,86,168,56,118,117,190,162,186,246,235,228)
|
||||
IMAGE_DATA(228,228,98,109,184,193,120,164,165,245,148,12,125,250,184,255,242,239,240,222,151,115,80,251,193,125,240,14,110,12,98,115)
|
||||
IMAGE_DATA(122,18,161,96,95,42,228,237,67,250,250,221,80,240,234,89,104,126,233,29,200,47,40,188,160,249,172,225,75,43,252,51)
|
||||
IMAGE_DATA(181,83,191,193,245,31,230,225,219,123,79,97,247,199,119,65,61,186,37,136,207,59,224,130,226,142,44,40,217,177,17,114)
|
||||
IMAGE_DATA(187,147,64,125,177,28,202,199,38,160,182,185,237,87,132,15,38,162,177,251,21,168,188,0,48,249,249,60,156,191,57,15)
|
||||
IMAGE_DATA(13,31,253,11,234,241,247,17,94,129,156,222,68,40,220,235,65,188,14,188,189,241,104,28,235,64,29,61,10,85,61,199)
|
||||
IMAGE_DATA(159,174,89,187,174,222,237,118,111,47,59,252,33,20,189,11,8,7,208,114,17,192,55,5,8,63,133,252,77,68,58,18)
|
||||
IMAGE_DATA(208,248,83,17,22,197,243,16,194,31,27,4,117,252,58,228,143,221,122,146,230,89,223,235,114,185,202,243,135,63,123,152)
|
||||
IMAGE_DATA(123,110,14,124,72,135,166,199,123,230,33,168,111,92,69,182,210,16,103,160,28,116,129,58,220,4,234,203,232,243,228,55)
|
||||
IMAGE_DATA(160,190,253,7,20,15,95,131,204,204,204,113,205,255,154,222,211,127,122,39,255,2,239,57,100,87,227,83,179,33,91,67)
|
||||
IMAGE_DATA(117,232,254,59,80,39,190,7,245,244,189,80,223,217,167,193,207,218,254,0,160,185,213,174,229,113,107,77,253,23,53,227)
|
||||
IMAGE_DATA(95,129,58,249,11,178,251,9,138,157,47,148,123,228,187,122,36,7,217,221,29,138,7,178,155,123,234,103,40,124,237,54)
|
||||
IMAGE_DATA(108,107,220,117,223,225,112,184,52,124,70,70,70,87,219,224,4,20,141,246,7,99,150,219,155,0,5,251,215,4,99,86)
|
||||
IMAGE_DATA(112,192,13,185,125,137,33,125,111,94,3,223,216,20,84,118,141,62,206,120,110,195,24,62,119,75,75,75,175,84,237,223)
|
||||
IMAGE_DATA(52,183,185,123,3,148,118,109,132,173,29,133,80,222,236,131,138,206,34,168,236,203,131,138,65,21,202,142,100,67,249,129)
|
||||
IMAGE_DATA(77,243,149,53,181,51,40,119,235,241,249,151,144,144,144,93,82,82,124,197,223,92,253,228,133,157,53,176,19,205,251,166)
|
||||
IMAGE_DATA(150,70,104,106,171,135,61,3,109,208,55,178,23,122,14,239,7,191,223,63,139,230,222,102,125,238,25,73,155,139,101,101)
|
||||
IMAGE_DATA(207,207,116,118,118,64,235,142,86,104,108,106,248,187,163,179,253,73,67,67,253,221,252,252,252,243,78,167,51,11,173,51)
|
||||
IMAGE_DATA(151,200,130,212,230,70,106,106,106,135,18,92,214,113,201,11,62,59,194,13,146,139,129,149,234,101,102,23,230,217,150,220)
|
||||
IMAGE_DATA(89,100,118,151,8,29,139,237,34,28,8,196,240,36,188,214,46,202,164,28,90,200,63,137,96,122,122,90,232,52,105,133)
|
||||
IMAGE_DATA(53,27,36,22,145,49,202,153,100,145,113,209,137,117,50,48,73,220,197,202,239,199,143,180,75,218,207,11,52,183,159,88)
|
||||
IMAGE_DATA(110,36,251,25,199,113,110,191,69,255,237,32,171,182,120,249,180,19,111,53,94,188,124,11,225,37,126,158,89,243,127,133)
|
||||
IMAGE_DATA(62,51,176,50,129,44,39,192,4,27,236,219,119,50,121,166,159,189,51,243,124,22,193,3,131,117,29,118,217,183,58,126)
|
||||
IMAGE_DATA(107,39,27,241,83,205,18,157,108,150,134,66,39,3,226,79,150,104,147,149,65,131,66,126,80,35,142,213,89,118,103,192)
|
||||
IMAGE_DATA(177,114,58,200,88,49,29,108,44,91,135,213,98,22,212,161,47,8,214,39,99,12,97,178,138,18,88,228,240,118,58,62)
|
||||
IMAGE_DATA(220,206,51,252,114,216,55,51,126,9,94,57,164,21,3,135,18,31,53,125,50,79,97,117,94,216,73,22,241,15,30,60)
|
||||
IMAGE_DATA(144,226,213,136,119,58,157,166,241,26,86,20,143,203,225,88,25,188,46,75,194,138,226,105,88,145,241,179,176,162,241,163)
|
||||
IMAGE_DATA(97,87,218,252,137,60,57,138,145,153,181,26,65,177,98,16,195,199,240,43,7,191,236,197,32,70,49,138,81,140,86,69)
|
||||
IMAGE_DATA(49,32,188,228,33,133,51,190,100,34,162,7,199,225,85,156,240,100,151,137,167,237,6,44,60,15,139,235,32,237,10,171)
|
||||
IMAGE_DATA(29,47,26,63,214,142,72,203,31,30,123,222,142,74,123,81,73,118,55,182,101,23,183,131,98,197,128,142,141,86,49,48)
|
||||
IMAGE_DATA(250,47,83,12,244,159,81,26,225,254,139,46,70,29,143,99,145,136,20,158,16,55,41,188,17,203,195,147,116,40,216,67)
|
||||
IMAGE_DATA(183,88,49,176,137,220,74,10,254,213,142,63,137,224,178,36,28,171,95,180,143,228,63,205,134,172,172,89,255,68,250,105)
|
||||
IMAGE_DATA(36,151,135,53,232,146,80,38,98,156,116,191,84,242,172,137,102,101,34,226,120,89,121,25,127,72,58,72,247,44,155,118)
|
||||
IMAGE_DATA(203,211,253,101,77,38,217,178,134,203,44,135,188,209,95,163,60,171,95,196,182,149,45,65,196,31,217,241,46,135,60,51)
|
||||
IMAGE_DATA(118,137,74,196,251,177,188,21,31,214,190,246,54,144,250,130,237,132,190,197,118,67,31,83,158,164,159,226,15,217,255,44)
|
||||
IMAGE_DATA(116,113,6,24,77,146,45,97,210,250,23,50,105,151,13,124,182,216,97,195,56,35,163,109,131,180,74,105,54,204,108,87)
|
||||
IMAGE_DATA(180,42,97,60,71,0,204,14,16,153,99,139,92,134,22,108,136,232,164,180,115,245,211,108,4,219,48,166,201,136,232,39)
|
||||
IMAGE_DATA(217,16,209,143,143,133,17,127,145,56,80,227,101,212,31,113,207,136,115,196,120,140,175,91,25,244,27,227,181,168,23,71)
|
||||
IMAGE_DATA(82,108,242,244,211,242,77,210,31,106,195,46,129,248,208,230,44,41,254,52,253,140,249,67,34,238,252,164,229,132,225,51)
|
||||
IMAGE_DATA(117,12,139,49,54,183,126,133,198,160,183,81,216,44,25,245,71,155,236,222,219,98,100,55,165,162,139,241,10,130,153,4)
|
||||
IMAGE_DATA(27,11,202,74,197,41,10,185,0,11,99,173,224,98,54,109,177,169,40,209,44,74,30,116,37,163,139,105,141,124,250,16)
|
||||
IMAGE_DATA(34,93,222,236,35,76,28,171,16,118,14,222,99,84,29,175,68,6,205,120,79,252,143,9,3,62,66,61,199,94,84,116)
|
||||
IMAGE_DATA(112,240,84,194,113,54,232,224,237,222,97,167,63,27,253,48,165,131,244,157,224,63,19,31,45,29,120,59,97,77,132,217)
|
||||
IMAGE_DATA(18,24,123,196,250,194,73,226,63,131,194,214,23,225,191,138,228,54,48,193,19,223,127,54,78,91,105,0,0,0,0,0)
|
||||
IMAGE_END_DATA(1696, 18)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,89,75,114,219,48,12,165,211,133,155,73,23,158,233,5,114,161,110,50,211,3,244,38,218,244,50,185,68,188)
|
||||
IMAGE_DATA(234,162,237,162,157,230,51,241,175,118,108,55,253,164,139,116,209,45,42,201,150,34,146,32,8,80,146,229,113,9,13,162)
|
||||
IMAGE_DATA(49,249,30,8,60,80,178,228,168,129,234,171,170,37,73,2,33,94,112,39,147,9,72,45,227,20,113,50,187,184,248,35)
|
||||
IMAGE_DATA(242,106,30,5,95,37,138,229,46,126,232,250,213,90,66,53,12,229,166,173,28,164,127,1,168,102,22,227,231,231,83,203)
|
||||
IMAGE_DATA(11,12,103,46,149,47,206,9,53,51,231,168,30,169,205,149,73,55,83,178,171,176,36,56,78,21,17,194,87,204,163,173)
|
||||
IMAGE_DATA(245,67,248,181,175,204,19,117,156,254,61,170,222,105,1,113,204,208,91,166,131,99,97,16,14,11,107,224,205,53,75,199)
|
||||
IMAGE_DATA(114,146,198,13,201,215,92,19,211,141,165,239,73,122,184,132,119,146,16,172,39,25,13,71,20,73,98,29,120,20,39,17)
|
||||
IMAGE_DATA(17,193,146,56,12,47,204,163,228,16,222,142,17,13,175,38,198,49,87,97,40,142,16,2,197,81,194,49,69,150,52,208)
|
||||
IMAGE_DATA(139,175,145,71,137,199,56,30,253,234,111,12,70,195,139,133,56,24,95,210,190,219,24,138,233,168,41,226,6,10,176,40)
|
||||
IMAGE_DATA(158,192,90,186,120,176,26,71,195,30,231,13,247,126,215,178,111,119,102,98,77,96,176,92,132,113,156,121,27,194,113,48)
|
||||
IMAGE_DATA(22,142,16,223,55,95,213,92,183,65,254,122,114,240,86,247,59,108,243,110,186,91,190,190,25,19,231,133,66,175,233,114)
|
||||
IMAGE_DATA(222,102,169,179,190,157,75,151,250,183,253,12,115,8,118,224,55,3,234,241,192,203,77,240,13,228,26,231,196,144,112,173)
|
||||
IMAGE_DATA(24,1,92,87,30,65,220,128,24,117,234,111,68,127,225,248,255,109,199,170,175,122,233,33,177,87,111,222,162,98,22,227)
|
||||
IMAGE_DATA(217,185,112,115,190,58,238,251,140,241,176,121,87,124,81,254,27,33,100,5,115,23,246,21,208,132,48,84,158,190,252,53)
|
||||
IMAGE_DATA(235,167,82,28,25,99,161,138,183,53,223,212,56,89,95,38,132,116,71,236,50,225,182,231,203,15,123,240,192,16,252,69)
|
||||
IMAGE_DATA(166,248,175,77,22,111,56,28,230,46,224,107,60,181,61,24,124,148,199,224,147,60,130,207,226,113,215,47,127,111,151,243)
|
||||
IMAGE_DATA(89,113,164,250,155,113,66,251,95,253,207,164,144,175,197,201,53,174,247,0,178,63,111,53,217,205,0,154,77,165,182,56)
|
||||
IMAGE_DATA(198,239,58,65,252,242,98,8,120,226,205,215,223,30,1,113,52,126,64,28,148,47,136,67,242,25,113,72,126,229,159,113)
|
||||
IMAGE_DATA(162,245,25,60,148,47,224,105,252,0,94,201,15,220,55,37,63,144,215,189,213,191,25,36,53,216,25,183,112,14,206,197)
|
||||
IMAGE_DATA(165,98,36,149,141,143,97,252,107,135,243,147,146,103,199,224,228,79,241,205,24,110,46,93,7,173,155,159,239,227,234,206)
|
||||
IMAGE_DATA(139,241,132,115,57,47,111,220,125,253,228,196,199,49,137,39,71,187,46,119,63,185,123,190,206,245,103,24,227,102,0,14)
|
||||
IMAGE_DATA(247,89,142,251,13,159,81,247,196,113,242,28,113,72,174,153,187,39,134,53,135,225,29,124,118,206,174,28,67,184,92,62)
|
||||
IMAGE_DATA(167,31,109,241,57,177,27,224,139,246,14,167,255,130,218,155,218,191,101,12,142,222,14,174,21,7,113,219,78,245,159,78)
|
||||
IMAGE_DATA(160,211,115,47,77,103,111,146,57,53,146,73,95,61,160,171,115,151,107,111,5,137,245,199,250,99,253,177,254,88,127,172)
|
||||
IMAGE_DATA(63,214,31,235,143,245,199,250,99,253,177,254,88,127,172,255,240,235,127,150,30,132,129,53,66,17,230,103,103,94,194,235)
|
||||
IMAGE_DATA(212,31,42,231,140,240,113,251,249,93,126,54,9,219,168,249,185,240,234,184,234,169,151,37,250,241,241,47,124,185,28,193)
|
||||
IMAGE_DATA(229,213,24,174,174,39,112,125,51,133,155,219,25,220,142,230,48,26,47,96,60,185,131,201,108,9,211,175,43,152,205,215)
|
||||
IMAGE_DATA(48,95,220,195,98,249,29,238,86,63,96,185,254,9,171,111,191,96,125,255,0,239,63,124,2,245,92,189,160,196,105,219)
|
||||
IMAGE_DATA(108,45,245,57,112,96,0,113,106,206,21,103,191,172,227,102,132,24,71,108,78,35,56,77,218,105,3,255,1,200,6,138)
|
||||
IMAGE_DATA(189,0,0,0,0,0,0,0,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(960, 28)
|
||||
IMAGE_DATA(120,156,237,153,203,113,219,48,16,134,97,95,52,26,95,92,130,207,238,37,233,33,247,20,193,75,110,46,32,53,120,220)
|
||||
IMAGE_DATA(131,213,66,174,25,165,132,228,144,6,16,82,22,17,60,246,241,47,64,154,138,130,229,172,53,34,246,91,236,3,132,72)
|
||||
IMAGE_DATA(218,221,187,123,247,143,139,143,180,138,247,141,252,175,70,254,123,35,255,210,200,127,109,228,159,26,249,207,141,252,199,70)
|
||||
IMAGE_DATA(254,177,145,119,219,242,203,201,46,219,12,134,97,240,185,206,231,143,199,163,143,101,250,62,219,76,242,250,250,59,104,204)
|
||||
IMAGE_DATA(207,99,110,112,125,140,24,163,106,22,215,150,234,5,117,126,108,229,78,109,38,162,92,195,17,145,22,5,162,92,241,16)
|
||||
IMAGE_DATA(213,10,108,157,159,107,130,165,134,181,236,249,202,244,30,185,50,159,159,127,20,58,219,32,99,99,249,250,152,177,102,249)
|
||||
IMAGE_DATA(24,112,101,202,205,180,172,42,42,8,68,165,36,106,120,7,30,107,205,95,195,55,95,153,119,110,63,254,189,141,119,90)
|
||||
IMAGE_DATA(79,40,37,228,150,201,48,133,13,193,64,182,153,125,62,103,80,42,38,171,223,154,120,243,57,169,186,65,245,189,27,15)
|
||||
IMAGE_DATA(174,240,44,68,216,42,193,36,118,66,146,162,45,99,79,218,89,138,72,216,138,118,148,189,49,142,192,8,186,142,8,13)
|
||||
IMAGE_DATA(143,3,67,132,75,140,180,19,10,65,218,73,133,3,139,108,105,160,106,223,16,71,176,167,24,165,126,237,11,3,104,248)
|
||||
IMAGE_DATA(60,17,98,163,5,173,109,99,164,205,70,77,49,55,208,96,75,218,11,182,69,93,20,219,132,73,108,247,167,134,171,191)
|
||||
IMAGE_DATA(181,240,118,151,7,182,132,13,21,139,209,15,27,119,86,56,196,166,176,19,138,175,141,199,53,79,229,10,222,34,34,210)
|
||||
IMAGE_DATA(250,27,246,246,108,250,190,124,186,24,7,246,66,145,231,228,20,91,44,45,243,151,177,108,89,255,181,239,97,174,65,174)
|
||||
IMAGE_DATA(124,51,144,110,15,84,118,160,23,16,119,30,241,97,97,11,31,21,44,23,71,21,91,225,163,37,255,69,234,111,60,255)
|
||||
IMAGE_DATA(127,203,222,237,220,205,120,88,228,195,167,47,100,49,231,243,211,231,172,249,120,124,94,251,78,113,212,56,231,223,20,255)
|
||||
IMAGE_DATA(91,33,108,9,163,19,107,9,44,81,24,41,78,45,254,68,118,99,41,110,179,115,181,21,95,107,124,169,243,98,126,83)
|
||||
IMAGE_DATA(33,172,43,226,61,3,94,123,60,124,185,128,27,134,234,31,50,135,63,54,21,220,225,112,56,169,129,79,56,119,62,0)
|
||||
IMAGE_DATA(158,228,0,94,228,4,30,226,208,249,195,251,118,59,15,249,177,214,63,247,83,219,255,248,63,147,70,62,241,115,170,113)
|
||||
IMAGE_DATA(219,13,200,229,60,213,76,155,129,95,54,148,230,226,100,239,117,170,248,112,49,84,220,241,158,230,63,31,21,126,18,190)
|
||||
IMAGE_DATA(194,15,201,27,252,136,60,224,71,228,163,127,198,153,230,7,56,146,55,112,9,95,193,5,190,114,221,4,190,146,219,94)
|
||||
IMAGE_DATA(218,55,131,161,129,158,216,89,17,59,142,149,124,12,209,194,167,108,244,185,235,249,33,112,165,15,36,126,137,207,125,240)
|
||||
IMAGE_DATA(172,156,135,92,55,157,215,216,84,49,31,127,237,56,197,226,166,85,235,39,226,159,182,25,148,24,203,188,248,126,162,107)
|
||||
IMAGE_DATA(190,229,250,203,4,216,12,60,163,154,156,236,126,250,111,164,42,126,88,142,241,35,178,121,236,138,143,98,140,178,103,120)
|
||||
IMAGE_DATA(56,102,46,198,26,22,229,145,126,172,197,35,190,23,224,77,107,7,233,191,33,247,165,214,111,240,129,212,155,97,11,63)
|
||||
IMAGE_DATA(132,150,242,144,190,58,241,155,126,222,140,225,92,76,48,15,89,48,227,163,135,223,234,115,203,185,207,5,233,249,247,252)
|
||||
IMAGE_DATA(123,254,61,255,158,127,207,191,231,223,243,239,249,247,252,123,254,61,255,158,127,207,255,234,243,255,3,94,59,109,245,0)
|
||||
IMAGE_END_DATA(832, 23)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,205,81,185,14,130,64,20,124,134,198,194,206,63,35,241,151,45,212,194,68,142,176,11,235,194,46,226,65,67,99)
|
||||
IMAGE_DATA(59,42,65,131,34,235,198,196,99,146,201,203,59,230,21,51,228,144,67,6,160,51,49,9,164,235,190,20,76,206,44,91)
|
||||
IMAGE_DATA(245,34,88,52,253,180,174,143,130,230,107,93,175,108,207,105,64,227,219,117,85,29,177,242,24,60,159,195,15,98,4,97)
|
||||
IMAGE_DATA(130,48,18,136,152,4,227,41,120,156,33,22,10,201,90,67,200,28,50,45,144,170,45,50,189,131,202,247,208,155,3,242)
|
||||
IMAGE_DATA(162,196,108,190,4,13,105,100,50,231,211,232,122,121,191,67,207,13,158,208,180,235,251,243,95,248,113,24,239,192,198,108)
|
||||
IMAGE_DATA(155,32,108,66,250,106,128,39,87,155,123,233,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(192, 7)
|
||||
|
|
|
|||
|
|
@ -147,6 +147,7 @@ Size FileList::GetStdSize(const Value& q) const
|
|||
}
|
||||
|
||||
void FileList::StartEdit() {
|
||||
if(GetCursor() < 0) return;
|
||||
Rect r = GetItemRect(GetCursor());
|
||||
const File& cf = Get(GetCursor());
|
||||
Font f = cf.font;
|
||||
|
|
@ -175,6 +176,11 @@ void FileList::OkEdit() {
|
|||
WhenRename(Get(c).name, ~edit);
|
||||
}
|
||||
|
||||
void FileList::KillEdit()
|
||||
{
|
||||
KillTimeCallback(TIMEID_STARTEDIT);
|
||||
}
|
||||
|
||||
void FileList::LeftDown(Point p, dword flags) {
|
||||
int c = GetCursor();
|
||||
if(IsEdit()) {
|
||||
|
|
@ -182,7 +188,7 @@ void FileList::LeftDown(Point p, dword flags) {
|
|||
c = -1;
|
||||
}
|
||||
ColumnList::LeftDown(p, flags);
|
||||
KillTimeCallback(TIMEID_STARTEDIT);
|
||||
KillEdit();
|
||||
if(c == GetCursor() && c >= 0 && !HasCapture() && renaming && !(flags & (K_SHIFT|K_CTRL)))
|
||||
SetTimeCallback(750, THISBACK(StartEdit), TIMEID_STARTEDIT);
|
||||
}
|
||||
|
|
@ -239,6 +245,7 @@ void FileList::Insert(int ii,
|
|||
m.data = data;
|
||||
m.underline = uln;
|
||||
ColumnList::Insert(ii, v, !m.isdir);
|
||||
KillEdit();
|
||||
}
|
||||
|
||||
void FileList::Set(int ii,
|
||||
|
|
@ -261,6 +268,7 @@ void FileList::Set(int ii,
|
|||
m.data = data;
|
||||
m.underline = uln;
|
||||
ColumnList::Set(ii, v, !m.isdir);
|
||||
KillEdit();
|
||||
}
|
||||
|
||||
void FileList::Add(const String& name, const Image& icon, Font font, Color ink,
|
||||
|
|
@ -318,6 +326,7 @@ struct FileList::FileOrder : public ValueOrder {
|
|||
|
||||
void FileList::Sort(const Order& order)
|
||||
{
|
||||
KillEdit();
|
||||
FileOrder fo;
|
||||
fo.order = ℴ
|
||||
int i = GetCursor();
|
||||
|
|
|
|||
|
|
@ -299,6 +299,10 @@ bool Load(FileList& list, const String& dir, const char *patterns, bool dirs,
|
|||
StdFont().Bold(), SColorText, true, -1, Null, SColorDisabled,
|
||||
root[i].root_desc, StdFont()
|
||||
);
|
||||
#ifdef PLATFORM_WIN32
|
||||
list.Add(t_("Network"), CtrlImg::Network(), StdFont().Bold(), SColorText,
|
||||
true, -1, Null, SColorDisabled, Null, StdFont());
|
||||
#endif
|
||||
}
|
||||
else {
|
||||
Array<FileSystemInfo::FileInfo> ffi =
|
||||
|
|
@ -397,6 +401,8 @@ String FileSel::GetDir() {
|
|||
}
|
||||
|
||||
void FileSel::SetDir(const String& _dir) {
|
||||
netstack.Clear();
|
||||
netnode.Clear();
|
||||
dir <<= _dir;
|
||||
Load();
|
||||
Update();
|
||||
|
|
@ -439,11 +445,56 @@ void FileSel::Load()
|
|||
SearchLoad();
|
||||
}
|
||||
|
||||
void FileSel::LoadNet()
|
||||
{
|
||||
#ifdef PLATFORM_WIN32
|
||||
list.Clear();
|
||||
for(int i = 0; i < netnode.GetCount(); i++) {
|
||||
Image m = CtrlImg::Group();
|
||||
switch(netnode[i].GetDisplayType()) {
|
||||
case NetNode::NETWORK:
|
||||
m = CtrlImg::Network();
|
||||
break;
|
||||
case NetNode::SHARE:
|
||||
m = CtrlImg::Share();
|
||||
break;
|
||||
case NetNode::SERVER:
|
||||
m = CtrlImg::Computer();
|
||||
break;
|
||||
}
|
||||
list.Add(netnode[i].GetName(), m);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void FileSel::SelectNet()
|
||||
{
|
||||
#ifdef PLATFORM_WIN32
|
||||
int q = list.GetCursor();
|
||||
if(q >= 0 && q < netnode.GetCount()) {
|
||||
NetNode& n = netnode[q];
|
||||
String p = n.GetPath();
|
||||
if(p.GetCount())
|
||||
SetDir(p);
|
||||
else {
|
||||
netstack.Add() = netnode[q];
|
||||
netnode = netstack.Top().Enum();
|
||||
LoadNet();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void FileSel::SearchLoad()
|
||||
{
|
||||
list.EndEdit();
|
||||
list.Clear();
|
||||
String d = GetDir();
|
||||
if(d == "\\") {
|
||||
netnode = NetNode::EnumRoot();
|
||||
LoadNet();
|
||||
return;
|
||||
}
|
||||
String emask = GetMask();
|
||||
if(!UPP::Load(list, d, emask, mode == SELECTDIR, WhenIcon, *filesystem, ~search, ~hidden, ~hiddenfiles)) {
|
||||
Exclamation(t_("[A3* Unable to read the directory !]&&") + DeQtf((String)~dir) + "&&" +
|
||||
|
|
@ -482,11 +533,12 @@ void FileSel::SearchLoad()
|
|||
if(filesystem->IsWin32())
|
||||
if(!IsEmpty(basedir) && String(~dir).IsEmpty())
|
||||
dirup.Disable();
|
||||
if(sortext && mode != SELECTDIR)
|
||||
SortByExt(list);
|
||||
else
|
||||
SortByName(list);
|
||||
olddir = ~dir;
|
||||
if(olddir.GetCount())
|
||||
if(sortext && mode != SELECTDIR)
|
||||
SortByExt(list);
|
||||
else
|
||||
SortByName(list);
|
||||
Update();
|
||||
}
|
||||
|
||||
|
|
@ -607,7 +659,16 @@ void FileSel::Finish() {
|
|||
|
||||
bool FileSel::OpenItem() {
|
||||
if(list.IsCursor()) {
|
||||
if(netnode.GetCount()) {
|
||||
SelectNet();
|
||||
return true;
|
||||
}
|
||||
const FileList::File& m = list.Get(list.GetCursor());
|
||||
if(IsNull(dir) && m.name == t_("Network")) {
|
||||
netnode = NetNode::EnumRoot();
|
||||
LoadNet();
|
||||
return true;
|
||||
}
|
||||
if(m.isdir) {
|
||||
SetDir(AppendFileName(~dir, m.name));
|
||||
return true;
|
||||
|
|
@ -620,6 +681,8 @@ bool FileSel::OpenItem() {
|
|||
|
||||
void FileSel::Open() {
|
||||
if(mode == SELECTDIR) {
|
||||
if(netnode.GetCount())
|
||||
return;
|
||||
Finish();
|
||||
return;
|
||||
}
|
||||
|
|
@ -635,6 +698,14 @@ void FileSel::Open() {
|
|||
else
|
||||
if(file.HasFocus()) {
|
||||
String fn = file.GetText().ToString();
|
||||
#ifdef PLATFORM_WIN32
|
||||
if(fn[0] == '\\' && fn[1] == '\\') {
|
||||
FindFile ff(AppendFileName(fn, "*.*"));
|
||||
if(ff)
|
||||
SetDir(TrimDot(fn));
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
if(fn == "." || fn == "..") {
|
||||
DirUp();
|
||||
return;
|
||||
|
|
@ -755,8 +826,28 @@ String DirectoryUp(String& dir, bool basedir)
|
|||
}
|
||||
|
||||
void FileSel::DirUp() {
|
||||
if(netstack.GetCount()) {
|
||||
netstack.Drop();
|
||||
if(netstack.GetCount()) {
|
||||
netnode = netstack.Top().Enum();
|
||||
LoadNet();
|
||||
}
|
||||
netnode = NetNode::EnumRoot();
|
||||
return;
|
||||
}
|
||||
if(netnode.GetCount()) {
|
||||
netnode.Clear();
|
||||
SetDir("");
|
||||
return;
|
||||
}
|
||||
String s = ~dir;
|
||||
String name = DirectoryUp(s, !basedir.IsEmpty());
|
||||
#ifdef PLATFORM_WIN32
|
||||
if(s[0] == '\\' && s[1] == '\\' && s.Find('\\', 2) < 0) {
|
||||
s.Clear();
|
||||
name.Clear();
|
||||
}
|
||||
#endif
|
||||
SetDir(s);
|
||||
if(list.HasFocus())
|
||||
list.FindSetCursor(name);
|
||||
|
|
@ -969,7 +1060,6 @@ void FileSel::Rename(const String& on, const String& nn) {
|
|||
}
|
||||
|
||||
void FileSel::Choice() {
|
||||
// String s = ~dir;
|
||||
Load();
|
||||
}
|
||||
|
||||
|
|
@ -1012,10 +1102,16 @@ void FolderDisplay::Paint(Draw& w, const Rect& r, const Value& q,
|
|||
{
|
||||
String s = q;
|
||||
w.DrawRect(r, paper);
|
||||
|
||||
#ifdef PLATFORM_X11
|
||||
Image img = GetFileIcon(GetFileFolder(s), GetFileName(s), true, false, false);
|
||||
#else
|
||||
Image img = s.GetCount() ? GetFileIcon(s, false, true, false) : CtrlImg::Computer();
|
||||
Image img;
|
||||
|
||||
if((byte)*s.Last() == 255)
|
||||
img = CtrlImg::Network();
|
||||
else
|
||||
img = s.GetCount() ? GetFileIcon(s, false, true, false) : CtrlImg::Computer();
|
||||
#endif
|
||||
if(IsNull(img))
|
||||
img = CtrlImg::Dir();
|
||||
|
|
@ -1114,6 +1210,8 @@ bool FileSel::Execute(int _mode) {
|
|||
ugly.Cat(root[i].root_style);
|
||||
dir.Add(root[i].filename, ugly);
|
||||
}
|
||||
if(filesystem == &StdFileSystemInfo())
|
||||
dir.Add("\\", String(t_("Network")) + String(0, 1) + "\xff");
|
||||
#endif
|
||||
if(filesystem->IsPosix() && String(~dir).IsEmpty())
|
||||
dir <<= GetHomeDirectory();
|
||||
|
|
@ -1222,6 +1320,10 @@ bool FileSel::ExecuteSelectDir(const char *title)
|
|||
}
|
||||
|
||||
void FileSel::Serialize(Stream& s) {
|
||||
if(s.IsLoading()) {
|
||||
netnode.Clear();
|
||||
netstack.Clear();
|
||||
}
|
||||
int version = 7;
|
||||
s / version;
|
||||
String ad = ~dir;
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ private:
|
|||
void UpdateSelect();
|
||||
void Update();
|
||||
bool FindChar(int from, int chr);
|
||||
void KillEdit();
|
||||
|
||||
struct FileOrder;
|
||||
|
||||
|
|
@ -141,6 +142,11 @@ protected:
|
|||
String preselect;
|
||||
Vector<String> fn;
|
||||
|
||||
#ifdef PLATFORM_WIN32
|
||||
Array<NetNode> netstack;
|
||||
Array<NetNode> netnode;
|
||||
#endif
|
||||
|
||||
DisplayCtrl preview_display;
|
||||
Ctrl *preview;
|
||||
FileList list;
|
||||
|
|
@ -156,6 +162,8 @@ protected:
|
|||
bool bidname;
|
||||
bool appmodal;
|
||||
|
||||
void LoadNet();
|
||||
void SelectNet();
|
||||
bool PatternMatch(const char *fn);
|
||||
bool OpenItem();
|
||||
void OpenItem2() { OpenItem(); }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue