Skip to content
Permalink
Browse files

Merge branch 'master' into feature/26_look_into_archive_files

# Conflicts:
#	wcm_codeblocks.cbp
  • Loading branch information
viktor-podzigun committed Sep 30, 2015
2 parents cb9c5c7 + 0eacd5b commit eb4a53af6acf63467e902c83e4656ef44fa6314e
Showing with 1,500 additions and 355 deletions.
  1. +501 −0 docs/wcmcommander.svg
  2. +497 −0 docs/wcmroot.svg
  3. +228 −333 src/icons/wcm.xpm
  4. +245 −0 src/icons/wcmroot.xpm
  5. +7 −2 src/nc.cpp
  6. +3 −0 src/ncwin.h
  7. BIN src/small.ico
  8. +19 −20 wcm_codeblocks.cbp

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -0,0 +1,245 @@
/* XPM */
static const char * wcmroot_xpm[] = {
/* columns rows colors chars-per-pixel */
"64 64 175 2 ",
" c #000000",
". c #000709",
"X c #000A0D",
"o c #000F13",
"O c #001419",
"+ c #001B21",
"@ c #00242D",
"# c #002C37",
"$ c #00323E",
"% c #32302F",
"& c #323334",
"* c #383B3C",
"= c #7F0025",
"- c #7D032A",
"; c #7C092D",
": c #790C32",
"> c #740F38",
", c #761237",
"< c #751238",
"1 c #003542",
"2 c #6F1E42",
"3 c #5D3F5F",
"4 c #6C2547",
"5 c #6B2648",
"6 c #662F51",
"7 c #00404F",
"8 c #004555",
"9 c #364548",
"0 c #32525A",
"q c #005568",
"w c #005E74",
"e c #275C60",
"r c #315A63",
"t c #00647B",
"y c #2D6264",
"u c #316365",
"i c #32626D",
"p c #326976",
"a c #326C7B",
"s c #32707E",
"d c #5C405F",
"f c #584866",
"g c #554C6B",
"h c #4F5675",
"j c #4E5B77",
"k c #4D5A78",
"l c #585C77",
"z c #585C78",
"x c #50627D",
"c c #636565",
"v c #921D1F",
"b c #94201E",
"n c #982A1D",
"m c #9B361F",
"M c #9D3A1E",
"N c #800027",
"B c #860C24",
"V c #890B22",
"C c #83042B",
"Z c #88072C",
"A c #85092F",
"S c #881023",
"D c #8F1E22",
"F c #901E21",
"G c #860C31",
"H c #880F34",
"J c #881135",
"K c #8E163A",
"L c #8C2126",
"P c #922321",
"I c #962C21",
"U c #A2431C",
"Y c #A6491B",
"T c #AD5718",
"R c #AF5E19",
"E c #AB611D",
"W c #B56B17",
"Q c #B16318",
"! c #BD7A15",
"~ c #B3721B",
"^ c #982F4F",
"/ c #9A3554",
"( c #9C3A59",
") c #A1415E",
"_ c #9D4663",
"` c #A24561",
"' c #A64C67",
"] c #A74E69",
"[ c #A4546F",
"{ c #A9526C",
"} c #AB5771",
"| c #A75A74",
" . c #AD5B74",
".. c #B05F78",
"X. c #AB627B",
"o. c #B1627A",
"O. c #CD9B0F",
"+. c #C28313",
"@. c #C58A12",
"#. c #C69214",
"$. c #D2A30E",
"%. c #D5AB0D",
"&. c #D9B20C",
"*. c #CDA513",
"=. c #E7CE07",
"-. c #E2C509",
";. c #E6CC08",
":. c #EAD506",
">. c #EFE005",
",. c #F1E304",
"<. c #F4E903",
"1. c #FCFA01",
"2. c #007A97",
"3. c #35638C",
"4. c #386B8C",
"5. c #3A7288",
"6. c #326D93",
"7. c #3D7992",
"8. c #456A85",
"9. c #436E89",
"0. c #41708B",
"q. c #B56A81",
"w. c #BB768B",
"e. c #38829A",
"r. c #0085A4",
"t. c #0096B9",
"y. c #318FA5",
"u. c #1EA1BB",
"i. c #26A4B7",
"p. c #20ADBF",
"a. c #32A7BA",
"s. c #588587",
"d. c #45869D",
"f. c #44889E",
"g. c #009DC2",
"h. c #0C9FC7",
"j. c #0C9EC8",
"k. c #04A0C7",
"l. c #0EA4C6",
"z. c #00A4CC",
"x. c #13AEC5",
"c. c #15B3C4",
"v. c #1FB0C2",
"b. c #00ABD4",
"n. c #00AED8",
"m. c #13AED5",
"M. c #08BDD8",
"N. c #14B0D6",
"B. c #12BDD2",
"V. c #2AB0C1",
"C. c #0AC4DB",
"Z. c #11CAD9",
"A. c #0ED9E6",
"S. c #0BDDEA",
"D. c #13E5F1",
"F. c #C38598",
"G. c #C5899B",
"H. c #C78FA0",
"J. c #CC98A8",
"K. c #D0A1AF",
"L. c #D5AAB7",
"P. c #D7ADBA",
"I. c #D8B1BD",
"U. c #DAB5C1",
"Y. c #DDBCC6",
"T. c #DFBFC9",
"R. c #E0C1CB",
"E. c #E5CAD2",
"W. c #E9D3DA",
"Q. c #ECD8DE",
"!. c #EFDFE4",
"~. c #F0DFE4",
"^. c #EFE0E4",
"/. c #F0E2E6",
"(. c #F1E4E8",
/* pixels */
"A.v.v.p.p.p.p.p.p.p.p.p.p.p.p.p.p.p.p.p.p.p.u.p.p.p.p.p.p.p.p.Z.S.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.D.",
"c.4 , , , , , , , , , , , , , , , , , , , , , , , , , , , : : 7.e.d d d d d d d d d d d d d d d d d d d d d d d d d d 3 d 3 5.S.",
"v., N N N N N = = = = = = N = = N N N N = N N V = = = = N N N 9.j N V N N V N N N N N N N V = N = = N V N N N N N V = V N N 3 A.",
"v.> F O.Q N C ` .} .} } } .{ ..{ .{ .{ .{ .} .{ ..( N 9.j V ! +.V N ^ .] o.] ..{ .] .{ o.] } ] o.] ..{ .' .) B 3 A.",
"v.> T 1.-.S J P.Q.^.W.^.W.^.W.^.W./.W./.W./.W./.W.^.W./.Q.K.Z 9.k n <.<.n - G.W.(.W.(.W./.W./.W.^.W./.W./.W./.W./.W.(.W.E.K d A.",
"v., b O.W N C ) { } { } { } { } ] } { } { } ] } { } ] | { ) N 9.k B @.@.S = / { } ] .] } ] | { } ] | { } { | { } { } { ] Z 3 A.",
"v., N M P N N G J G G A J G H S H A H A H G H G J S J A J A N 9.j N I I C N C J A J A J G J A J B J A J A J A J G J G J B N 3 A.",
"v.> Y ,.%.B G G.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.w.B 8.j v =.=.D N q.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.J.H d A.",
"v., Y <.%.B J G.I.U.I.U.I.U.I.U.L.Y.P.U.I.Y.L.Y.L.Y.P.Y.P.F.Z 9.j v :.:.P C w.L.T.L.Y.L.Y.L.Y.L.Y.L.Y.L.Y.L.Y.L.Y.L.T.P.L.J 3 A.",
"v., N U P N - A A G A G A G G G G G G G A A A G A G Z A A Z N 9.k N m m N N C G G G G G G A J A J A G A G A J Z H Z G G G N 3 A.",
"v., P @.Q N C ) .{ } { } { } { .{ .{ } { .{ .{ .{ ./ C 8.j V ! ! B N ^ .] .] .{ .{ } { .{ .{ .] .{ } { .) Z 3 A.",
"v.< T 1.-.S H P.Q./.W./.Q./.W./.W.~.W.~.W./.W./.W./.W./.Q.K.Z 9.k n <.<.I - G.Q.(.W./.W./.W./.W.^.W./.W./.W./.W./.W./.W.E.K 3 A.",
"v., P O.W N A ` { .{ } { } { .{ .{ } { } { } { .{ } { ) N 9.k V @.@.B - ( { .{ .{ .{ .{ .{ .{ .{ .{ .{ .{ { Z 3 A.",
"v.< N M D = = A J A J A J A J A H G H G J A J A J A J G J Z N 9.j N n n N N C J A H A J A J A J A J Z J A H A J Z J Z J A N 3 A.",
"v.> Y ,.%.B G F.I.I.I.P.I.I.I.I.I.L.I.P.I.I.P.P.P.I.I.P.I.w.Z 9.j v =.;.P N q.P.P.P.P.P.P.P.P.P.L.I.I.L.P.I.P.I.I.I.P.I.J.H 3 A.",
"v., Y <.&.B J H.I.Y.I.U.I.U.I.Y.I.Y.L.Y.I.Y.I.Y.P.Y.I.Y.I.F.C 9.k v :.:.P N w.P.T.P.T.P.T.P.T.P.Y.I.Y.P.R.P.Y.L.R.L.Y.I.L.J 3 A.",
"v., B U P = N G H G G G G G G G G G H H Z H A H H H A H A A N 9.j N m m N N C G H G H G H G H A J A J A H A H G J A H A A N d A.",
"v.< D @.R C C ) { { } { } ] } { | ] } ] } ] } ] } ] } ] } / C 9.j B ! ! B - ^ .' } ] } ' } ] | ] | ] .{ } ' } { } { .) Z 3 A.",
"v.< T 1.-.S J L.Q.~.W.!.W.!.W.^.W./.W.~.W.~.W./.W.~.W./.Q.K.Z 0.k n <.<.I N F.Q./.W.(.W./.W./.W./.W./.W./.W.(.W./.W./.W.E.K 3 A.",
"v.< L *.~ ; G _ | X.| X. .X. .X.| X.| X.| X.| X.| X.| X.| ` C 0.j V @.@.B N ( } .{ .{ ..{ ..{ ..{ ..{ X.{ .{ .{ o.{ { Z 3 A.",
"B.6.3.7.4.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.u.h N I I - N C H G H A H G G G H Z J A J A J A G A H Z H Z N 3 A.",
"C.h.l.c.x.l.j.m.N.m.m.m.m.m.m.N.m.m.m.N.m.N.m.m.m.m.m.m.m.m.j.M.h F ;.=.P N q.P.P.P.P.L.P.P.L.P.L.L.L.L.P.L.L.P.L.I.L.P.J.H 3 A.",
"C.h.l.c.x.l.l.m.N.N.N.N.m.N.N.N.N.N.N.N.N.N.m.N.m.N.m.m.m.m.l.M.h b :.:.P N w.I.R.I.R.I.T.P.R.P.R.I.T.I.T.I.T.I.R.I.R.I.P.J 3 A.",
"B.6.3.4.4.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.3.u.l N m m N N A H J H J G J J J H J J J J J J J J J H J J J N 3 A.",
"v.< L #.E ; A _ | [ | [ | [ | [ | [ .[ .[ | [ | [ | [ .( - 5.j N N N N N N N N - N = = - - N = = = - - = N N = = N = = N 3 A.",
"v.> T 1.-.S J P.Q.!.W.!.W.!.W./.W.~.W.^.W./.W.^.W.^.W./.Q.K.A 8.h N N N N N N N N N N N N N N N N N N N N N N N N N N - N N 3 A.",
"v.< P *.W N A ` . .} .} o.} .} .} ..} .} ..{ ..| ..} ` N 8.j N N N N N N N N - N N N N N N N N N N N N N N N = N N N N 3 A.",
"v.< N m D N N A H A H G H A J A J G G A H A G G H A H A G Z N 9.j N N N = N N N N N N N N N N N N N N N N N N N N N N N N N d A.",
"v., U >.$.B G F.L.L.L.L.L.L.P.L.L.L.L.L.L.L.L.L.L.L.L.L.P.w.Z 8.h N N N N N = N N - N N N - N N N N N N N N N N N N N N N N 3 A.",
"v.< Y <.&.B G J.U.R.U.R.I.T.I.R.I.R.I.R.I.R.U.R.I.R.U.R.U.G.Z 9.j N N N N N N N N N N N N C N N - N N N N N N N N N N N N N 3 A.",
"v., B U I N N G J J J J J J J J J J J J J J J J J J J J J G N 9.j N N N - N N = N N N N N N N N - N N N N C N N N N N N N N 3 A.",
"v.< = = - N N N = = = = N = - N = = - N N N = = N N = = = N N 9.j N N N N N N N N N N N N - N N N N N N N N N N N N N N N N 3 A.",
"v.< N N N - N N - C N N N N N N N N N N - C N N N N N N N N N 9.j N N N N N N N N N N N N N - N N N N N N N N N N N N N C N 3 A.",
"v.< N N N N N - N N N N N N N N - N N N N N N N N N N N N N N 8.j N N N N N N N N N N N N - C N N - N N - N N N N N N N - N 3 A.",
"v.< N N N N N C N N N N N N - N N N N N N N N N N N N N N N V 8.j N N N N N N N N N N N N N N N N N N N N N N N N N N N N N 3 A.",
"v.< N N N N N N - N N N - N N N N N N N N - N N N N N N N N N 9.j N N N N N N N - N N N N N N N - N N N N N N N N - N N N N 3 A.",
"v.< N N N N N N N N N N N N N N N N N N N N N N N N N N N N N 9.j N N N N N N N N N N N N N N N N N N N N N N N N N N N N N 3 A.",
"v.< N N - N N N N N N N N N N N N N N N N N N - N N N N N N N 9.j N N N N N N N N - N N N - N N N N N - N N N - N N N N N N 3 A.",
"v., N N N N N N N N N N - N N - N N - N N N - N N N C - N N N 9.j N N N N N N N N N N N N N N N N N N N N - N N N N N N N N 3 A.",
"v., N N N N N N N - N N N N N C N N N N N N N N N N N N N N N 9.j N N N N N N N N - C N N N N N N N N N N C N N N N N N N N 3 A.",
"v., N N N N N N N N N N N N N N N N N N N N N - N N N - N N N 9.j N N N N = N N = N N - N - N N N N N N N N N N N N N N N N 3 A.",
"v.< N N N N N N - N N N N N N N C N N N N N N N N N N N N N N 9.j N N N N N N N N N N N N N N N N N N - N N N N C N N N N N 3 A.",
"v.< N N N N N N N N N N N N N N - N - N N N N N N N N N N N N 9.l N N N N N N N N N N N N N N N C - N N N N N N N N N N N N 3 A.",
"v., N N N N N N N N N N - N N N N N N N N N N N N N N N N N N 9.j N N N N N N N N N N N N N N N N N N N N N N N N N N N N N 3 A.",
"v.< N N C - N N N N - N N N N N N N N N N N N N N N N N N N N 9.j N N N N N N N N N - N N N N - N N - N N N N N N N N N N C 3 A.",
"v.< N N N N N N N N N N N N N N N N N N N - N N N N N N N N N 9.j N N N N N N N N - N N N N N N N N N N C N N N N N N N N N 3 A.",
"v., N N N N N N C - N N - N N N N N - N N - N N N N N N N N N 8.j N N N N N N N N N N N N N N N N N N N N N N N N N N N N N 3 A.",
"v.< N - N N N N N N N N N N N N - N N N N C N N N N N N N N N 9.j N N N N N N N N N N N N N C - N N N N N N N N N N N N N N 3 A.",
"v.< N N N N N N N N N N C - N N = N N = N N - N N N N N N N N 9.j N N N N N N N - N N = N N N N N N N N N N N N - N N N N N 3 A.",
"v., N N N N N N N = N = = = N N N N N N N N = = N N N N N N N 9.j N N N N N N N N N N N N N N N - N N N N N N N N N - N N N 3 A.",
"v., C N N N N N N = N N = N N N N N N N = C = C N N N N N = N 9.j N N N N N N N N N N N N N N N - N N N N N N N N N N N N N 3 A.",
"v., N N N N N N N N N N N N N N = N N N N N = = N N = N = = V 8.j N N N N N N N N N N N N N N N N N N N N N N N N N N N N N 3 A.",
"v.2 ; : : : ; : : : ; ; : : : : ; ; : : : : : ; : : ; : : : ; 7.x ; : : : : : : : : : : ; : : : : : : : : : : : : : : : ; ; f A.",
"i.6 5 5 5 5 4 4 5 5 5 4 5 5 5 5 4 4 5 5 5 5 5 4 5 5 4 4 5 5 5 e.x 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 4 4 4 4 4 4 4 4 4 5 4 4 4 4 j S.",
"y.; N N N N N N N N N N N N N N N N N N N N N N N N N N N N N 8.f N = = N N N N N N N N N N N N N N N N N N N N N N N N N N f S.",
"y.; N N N N N N N N N N N N N N N N N N N N N N N N N N N N N 8.g = - - - - - - - - - - - - - ; - - - - - - N - - - - - C N g S.",
"V.x l z z z z z l l z z z z z z z z z z z z z z z z z z l l l a.a.d.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.f.a.D.",
"e e e e e e e e e e e e e e e e e e e e e e e e e e e e e e e e y u u u u u u u u u u u u u u u u u u u u u u u u u u u u u u s.",
" * ",
" * ",
"O 7 8 8 8 8 8 8 7 o @ 8 8 8 8 8 8 8 $ . . $ 8 8 8 8 8 8 8 @ X 7 8 8 8 8 8 8 8 O O 8 8 8 8 8 8 8 7 . # 8 8 8 8 8 8 8 # * ",
"$ k.n.b.b.b.b.b.g.@ q n.n.b.b.b.b.n.r.. . 2.n.b.b.b.b.n.n.w + t.n.b.b.b.b.n.z.1 8 b.b.b.b.n.b.b.t.O t n.b.b.b.b.m.n.t d ",
"$ t.z.z.z.z.z.z.t.@ q z.z.z.z.z.z.z.r.X . 2.z.z.z.z.z.z.z.w O t.z.z.z.z.z.z.k.$ 7 k.k.z.z.k.k.z.t.O t z.k.z.z.z.z.z.t 9 ",
"9 a s a s s s s p 9 % 0 s s s s s s s i & & r s s s s a s s 0 & * a s s s s s a a 9 & 9 a s s s s s s p * & 0 s s s s s s s y c "
};
@@ -360,7 +360,7 @@ std::string GetStartupDir( const char* ModulePath )
{
#if !defined(_WIN32)
char Buf[ PATH_MAX ];

const char* Res = realpath( ModulePath, Buf );

return Res ? dirname( Buf ) : std::string();
@@ -441,7 +441,12 @@ int main( int argc, char** argv )

#ifndef _WIN32
#include "icons/wcm.xpm"
Win::SetIcon( wcm_xpm );
#include "icons/wcmroot.xpm"
if ( IsRoot() ){
Win::SetIcon( wcmroot_xpm );
} else {
Win::SetIcon( wcm_xpm );
}
#endif

InitFonts();
@@ -377,3 +377,6 @@ class NCWin: public NCDialogParent
private:
void DebugKeyboard( cevent_key* KeyEvent, bool Pressed, bool DebugEnabledFlag ) const;
};


bool IsRoot();
BIN +2.2 KB (130%) src/small.ico
Binary file not shown.
@@ -17,6 +17,7 @@
<Add option="-g" />
<Add option="-I/usr/include/freetype2" />
<Add option="-m64" />
<Add option="-std=c++11" />
<Add option="-Isrc/swl -Isrc/wal -Isrc -Isrc/vfs" />
<Add option="-D_DEBUG" />
<Add option="-DUSEFREETYPE" />
@@ -44,6 +45,7 @@
<Option compiler="gcc" />
<Compiler>
<Add option="-O3" />
<Add option="-std=c++11" />
<Add option="-I/usr/include/freetype2" />
<Add option="-m64" />
<Add option="-Isrc/swl -Isrc/wal -Isrc -Isrc/vfs" />
@@ -149,12 +151,6 @@
<Add library="smbclient" />
<Add library="stdc++" />
<Add library="freetype" />
<Add library="X11" />
<Add library="pthread" />
<Add library="ssh2" />
<Add library="smbclient" />
<Add library="stdc++" />
<Add library="freetype" />
</Linker>
</Target>
<Target title="Release Win32">
@@ -186,6 +182,9 @@
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-std=c++11" />
</Compiler>
<Unit filename="src/ReadMe.txt" />
<Unit filename="src/Resource.h" />
<Unit filename="src/charsetdlg.cpp" />
@@ -195,6 +194,8 @@
<Unit filename="src/dircalc.cpp" />
<Unit filename="src/dircalc.h" />
<Unit filename="src/dlg-ctrl-l.cpp" />
<Unit filename="src/drive-dlg.cpp" />
<Unit filename="src/drive-dlg.h" />
<Unit filename="src/eloadsave.cpp" />
<Unit filename="src/eloadsave.h" />
<Unit filename="src/ext-app-ux.cpp">
@@ -205,6 +206,10 @@
</Unit>
<Unit filename="src/ext-app-win.cpp" />
<Unit filename="src/ext-app.h" />
<Unit filename="src/file-exec.cpp" />
<Unit filename="src/file-exec.h" />
<Unit filename="src/file-util.cpp" />
<Unit filename="src/file-util.h" />
<Unit filename="src/fileassociations.cpp" />
<Unit filename="src/fileattributes.cpp" />
<Unit filename="src/filehighlighting.cpp" />
@@ -214,20 +219,6 @@
<Unit filename="src/filesearch.h" />
<Unit filename="src/folder-history.cpp" />
<Unit filename="src/folder-history.h" />
<Unit filename="src/view-history.cpp" />
<Unit filename="src/view-history.h" />
<Unit filename="src/drive-dlg.cpp" />
<Unit filename="src/drive-dlg.h" />
<Unit filename="src/file-util.cpp" />
<Unit filename="src/file-util.h" />
<Unit filename="src/file-exec.cpp" />
<Unit filename="src/file-exec.h" />
<Unit filename="src/plugin/plugin.cpp" />
<Unit filename="src/plugin/plugin.h" />
<Unit filename="src/plugin/plugin-archive.cpp" />
<Unit filename="src/plugin/plugin-archive.h" />
<Unit filename="src/nceditline.cpp" />
<Unit filename="src/nceditline.h" />
<Unit filename="src/folder-shortcuts.cpp" />
<Unit filename="src/folder-shortcuts.h" />
<Unit filename="src/fontdlg.cpp">
@@ -255,6 +246,8 @@
<Unit filename="src/ncdialogs.h" />
<Unit filename="src/ncedit.cpp" />
<Unit filename="src/ncedit.h" />
<Unit filename="src/nceditline.cpp" />
<Unit filename="src/nceditline.h" />
<Unit filename="src/ncfonts.cpp" />
<Unit filename="src/ncfonts.h" />
<Unit filename="src/nchistory.cpp" />
@@ -275,6 +268,10 @@
<Unit filename="src/panel_list.h" />
<Unit filename="src/path-list.cpp" />
<Unit filename="src/path-list.h" />
<Unit filename="src/plugin/plugin.cpp" />
<Unit filename="src/plugin/plugin.h" />
<Unit filename="src/plugin/plugin-archive.cpp" />
<Unit filename="src/plugin/plugin-archive.h" />
<Unit filename="src/search-dlg.cpp" />
<Unit filename="src/search-dlg.h" />
<Unit filename="src/search-tools.cpp" />
@@ -372,6 +369,8 @@
<Unit filename="src/vfs/vfs.h" />
<Unit filename="src/vfs/vfspath.cpp" />
<Unit filename="src/vfs/vfspath.h" />
<Unit filename="src/view-history.cpp" />
<Unit filename="src/view-history.h" />
<Unit filename="src/w32cons.cpp">
<Option target="Release Win32" />
<Option target="Debug Win32" />

0 comments on commit eb4a53a

Please sign in to comment.
You can’t perform that action at this time.