From fc506396cbee842e9a48b42e8a60040e102f51c7 Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 15 Dec 2008 10:39:42 +0000 Subject: [PATCH] svn icon in toolbar git-svn-id: svn://ultimatepp.org/upp/trunk@705 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/icon.ico | Bin 2862 -> 2862 bytes uppsrc/ide/ide.iml | 37 ++++++++++++++++++++++++------------- uppsrc/ide/idebar.cpp | 6 ++++-- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico index e73216a12a1386ae0b0b81b51b653562bed6dfdf..3fbfb8a5881abb6b5aaa669cbca302327a137013 100644 GIT binary patch literal 2862 zcmcguy>8S%5FYhC8+w{8>d zqlWc9Ya&mg1FrjzV!2nSyV{4fmIJnJThSR@Qny;IEEM&?D+hc(H!+BXFv2OYICUJ- zpCig0;H96`aJ|}|&5LQSvus5AdyeiqOe36{gJl#{p@+;;|ENV~@8Is2wGOw= zRN0*V{QN~#YN=!b%W=ywxAG7*!$15)_A08>z+w(x&(6lapTilL2>+Kc$E=5B6@PR@ zRuwp$C-K0(Vtq8mhkezb?2q2hV!Za(-mnoK{n7geE6=I(YroJ&c=QIIvG(_XpX!a8 z2oJ0(&v5DfxHtC|4!%o>59f&b1FQSH%KdR~%m5A#ANGYmd4JtM=J4=1PiZti-ka{< z!)t%#P(Q@OzpU!-f2K9_q|UOwFiR3s*O_4>QWb?M>)I5Zk6>BWE@@20V$!n20Ws&N zW4}mK%?qw5QpFqa=d8*ve(w2IWwJas)i5G+b^c|jy#n<<1u3-Dn+06skrrEs2bG!VuL_OOVVvpC)w@;B- LKgKhV>+b0v@@TmI literal 2862 zcmcguy=xRv5TCt`-abLhM`dLY)D#wy1i>yv{0Aggix?z!f~epHv!I}jALnh7+d?aa zhzJ3jZ4S1u5iG5&&g!ZZ+Gr76=QnTP?%TZ&R}2o!&YQ2_%$xV_aYPQeG&xB^YZFB0 zd6nshh+eYI=yMLy;Uh$Ih+&>(cH~R6#Bu+T60TL|aplXg2^*3)j)f~=Nu2Nd2^jIn zHyF@u-;hQU5NBvcE>E%gMm{2?(`3+OYOSc+59**{|bz!{#8BLpt? zTOnUS(s(@wvh_*o)zjLHpj^A(#v3e*)o7v4mb!MJKH}&6uUY5{Dzd- z_G674TV1DuJE9r0P$%ZkHl&9H~Pe-rjF86qb4*g1s zvjK=Bo})zHbbp_EHwkqxw>49b&vm(VZ=fd5*tSE*`95o{P{cKDD#sb0xhFW5p>x!2 z<@YGkdqSNmG~+9o#}_WJm*`wm2j@PLe)37Z>r=e=#tPBi~9yTcg5TT{d*E)`pNHsOa4xu{&WviH40oe z3v?Yv1%azr2zkw>st18;raFxEdZ3+3xlAgm*Rg<2>rqi}Mv?JLUb7jQd#FbUkW?{+gS52(TYGBjYU_9yb{gB) zHd%(@_HBF@7M|Z}a|FvXT5g_%48zS!_;wmW1Mw^`ihR^w?p%PUy@+p#{&h~j0mG(b AGXMYp diff --git a/uppsrc/ide/ide.iml b/uppsrc/ide/ide.iml index aeee27716..2a5fa7778 100644 --- a/uppsrc/ide/ide.iml +++ b/uppsrc/ide/ide.iml @@ -67,6 +67,7 @@ IMAGE_ID(index) IMAGE_ID(show) IMAGE_ID(tpp_pen) IMAGE_ID(tpp_doc) +IMAGE_ID(svn) IMAGE_BEGIN_DATA IMAGE_DATA(120,156,237,152,77,210,155,48,12,134,125,129,206,124,187,206,116,213,235,244,84,229,68,61,67,206,145,35,116,217,46,187) @@ -3858,16 +3859,26 @@ IMAGE_DATA(25,114,248,31,15,161,22,99,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, IMAGE_END_DATA(5568, 20) IMAGE_BEGIN_DATA -IMAGE_DATA(120,156,99,16,96,16,96,160,38,40,236,92,246,159,28,140,172,255,255,127,6,20,188,106,213,170,255,248,0,86,253,207) -IMAGE_DATA(129,184,3,136,11,17,250,235,235,235,225,24,198,199,170,31,164,55,18,136,181,80,245,147,100,63,200,110,71,76,253,216) -IMAGE_DATA(220,128,213,126,144,221,11,200,244,127,7,84,63,200,29,231,201,240,191,22,3,2,47,32,195,126,71,136,189,96,253,207) -IMAGE_DATA(49,245,163,187,3,67,255,121,164,240,35,55,254,29,161,102,252,39,51,254,181,160,126,32,199,254,5,72,225,143,197,126) -IMAGE_DATA(244,112,64,215,79,73,254,161,8,80,187,48,0,130,255,100,98,184,126,82,1,54,253,12,80,8,2,198,198,198,56,49) -IMAGE_DATA(49,250,41,181,31,162,166,1,142,137,209,79,169,255,97,0,159,191,233,97,63,57,250,41,76,63,232,0,151,249,196,2) -IMAGE_DATA(74,244,227,82,75,172,25,148,234,39,13,240,80,191,48,24,104,224,141,7,99,87,223,208,128,137,71,213,35,212,147,22) -IMAGE_DATA(158,76,56,196,7,63,24,134,153,97,21,3,246,146,115,21,14,245,255,245,106,107,79,167,204,152,113,218,190,181,245,180) -IMAGE_DATA(64,94,222,105,230,244,244,211,12,184,75,158,255,32,181,155,15,28,56,157,59,119,238,105,29,160,94,142,172,44,188,234) -IMAGE_DATA(29,218,218,192,106,125,122,123,79,171,87,86,158,230,36,160,94,16,232,6,125,160,185,154,213,213,167,37,139,138,78,179) -IMAGE_DATA(101,102,226,85,207,154,145,113,26,164,71,40,63,255,52,119,78,14,65,247,51,164,165,129,213,128,48,19,72,45,144,143) -IMAGE_DATA(71,61,169,225,57,100,1,0,113,157,94,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0) -IMAGE_END_DATA(384, 4) +IMAGE_DATA(120,156,237,152,207,107,146,113,28,199,223,41,214,156,25,58,33,40,214,178,203,70,22,6,121,201,58,108,82,52,34,237) +IMAGE_DATA(22,52,6,65,169,155,27,75,217,14,107,34,75,89,108,56,72,232,150,3,7,94,50,240,218,63,48,104,183,239,97,176) +IMAGE_DATA(78,222,212,203,14,117,107,7,61,61,125,191,207,163,143,191,158,199,199,231,121,164,95,244,150,247,225,249,240,126,125,63) +IMAGE_DATA(223,31,62,95,68,216,96,195,48,181,186,91,224,180,184,157,231,56,116,184,88,44,114,253,36,201,159,80,167,169,87,91) +IMAGE_DATA(124,50,153,20,221,124,150,228,25,59,71,237,234,228,85,245,103,189,125,189,188,212,28,36,251,179,222,121,141,235,79,55) +IMAGE_DATA(120,54,143,35,13,235,119,161,229,188,134,254,62,161,47,207,159,244,242,221,243,232,225,143,218,246,79,235,249,251,26,99) +IMAGE_DATA(112,26,207,223,213,88,131,150,254,249,182,253,151,232,223,189,15,221,188,158,247,71,151,134,125,25,80,113,26,45,242,106) +IMAGE_DATA(37,197,163,241,97,242,120,60,178,30,132,215,219,95,200,164,68,15,194,235,93,127,83,253,214,253,43,250,107,225,117,126) +IMAGE_DATA(127,186,37,55,254,160,210,195,203,101,7,29,67,47,175,78,231,135,127,25,252,110,61,238,99,233,124,42,213,235,255,249) +IMAGE_DATA(86,94,221,126,26,100,234,127,190,254,193,151,161,8,233,155,179,40,147,231,220,155,155,36,148,205,146,233,237,109,98,139) +IMAGE_DATA(70,137,113,113,145,64,254,230,225,88,246,243,193,1,121,181,191,79,110,82,118,100,121,185,111,126,102,103,135,207,250,51) +IMAGE_DATA(25,50,21,143,19,179,66,222,78,231,112,139,142,123,61,145,32,151,214,214,200,217,165,165,190,121,83,36,66,24,51,22) +IMAGE_DATA(139,17,203,202,138,226,252,177,176,192,103,152,13,44,75,159,251,228,213,238,231,223,43,27,46,72,214,175,2,223,67,236) +IMAGE_DATA(224,169,3,194,226,95,0,161,144,96,183,91,105,220,39,148,231,216,79,6,234,47,34,127,124,12,148,74,64,165,2,100) +IMAGE_DATA(179,128,213,170,142,103,178,219,129,104,20,56,61,5,10,5,57,222,8,236,141,2,31,153,71,168,105,105,186,51,225,245) +IMAGE_DATA(2,213,42,176,181,213,81,54,192,4,7,174,225,204,32,55,92,46,7,148,203,192,248,184,88,122,128,56,222,211,249,122) +IMAGE_DATA(17,86,230,29,14,97,137,147,147,252,99,0,187,200,160,206,243,239,80,195,125,172,203,179,179,179,192,252,188,192,71,34) +IMAGE_DATA(20,14,224,6,252,184,135,8,207,223,198,28,166,240,80,158,95,167,99,215,106,2,95,175,3,233,52,95,190,72,41,198) +IMAGE_DATA(143,98,76,121,254,225,176,192,111,108,136,37,27,174,224,13,202,120,134,156,50,111,160,123,236,116,2,38,83,71,249,17) +IMAGE_DATA(222,34,133,42,156,184,219,5,204,192,108,46,192,98,17,108,52,238,201,14,253,28,159,232,110,254,160,167,30,131,89,188) +IMAGE_DATA(241,95,226,240,176,245,111,68,32,240,77,150,63,7,43,158,226,3,146,168,32,129,18,94,227,171,42,190,169,203,112,227) +IMAGE_DATA(14,130,188,25,239,247,115,8,6,5,79,76,116,240,63,1,157,183,215,223,0,0,0,0,0,0,0,0,0,0,0,0) +IMAGE_END_DATA(704, 5) diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp index 844be808e..322263e99 100644 --- a/uppsrc/ide/idebar.cpp +++ b/uppsrc/ide/idebar.cpp @@ -296,7 +296,6 @@ void Ide::ProjectSvn(Bar& menu) w.Insert(0, p); for(int i = 0; i < w.GetCount(); i++) menu.Add("Synchronize " + w[i], THISBACK1(SyncSvnDir, w[i])); - menu.Add("Synchronize everything..", THISBACK(SyncSvn)); } void Ide::Project(Bar& menu) { @@ -329,7 +328,10 @@ void Ide::Project(Bar& menu) { menu.Add("Convert s_ -> t_", THISBACK(ConvertST)); FilePropertiesMenu(menu); if(SvnDirs().GetCount()) - menu.Add("SVN", THISBACK(ProjectSvn)); + if(menu.IsMenuBar()) + menu.Add("SVN", THISBACK(ProjectSvn)); + else + menu.Add("SVN Synchronize everything..", IdeImg::svn(), THISBACK(SyncSvn)); } void Ide::FilePropertiesMenu(Bar& menu)