From 5c0cdea8321bbfc5cd6bed58ec9ac1fb5aa8ef97 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 11 Apr 2012 12:24:51 +0200 Subject: [PATCH] 0000653: Menu shortcuts for the Sketcher item overlap with the Tools menu item --- .../Gui/Resources/translations/Complete_af.qm | Bin 1286 -> 1293 bytes .../Gui/Resources/translations/Complete_af.ts | 4 ++-- .../Gui/Resources/translations/Complete_de.qm | Bin 1302 -> 1309 bytes .../Gui/Resources/translations/Complete_de.ts | 4 ++-- .../Gui/Resources/translations/Complete_es.qm | Bin 1274 -> 1281 bytes .../Gui/Resources/translations/Complete_es.ts | 4 ++-- .../Gui/Resources/translations/Complete_fi.qm | Bin 1244 -> 1251 bytes .../Gui/Resources/translations/Complete_fi.ts | 4 ++-- .../Gui/Resources/translations/Complete_fr.qm | Bin 1332 -> 1339 bytes .../Gui/Resources/translations/Complete_fr.ts | 4 ++-- .../Gui/Resources/translations/Complete_hr.qm | Bin 1284 -> 1291 bytes .../Gui/Resources/translations/Complete_hr.ts | 4 ++-- .../Gui/Resources/translations/Complete_hu.qm | Bin 1312 -> 1319 bytes .../Gui/Resources/translations/Complete_hu.ts | 4 ++-- .../Gui/Resources/translations/Complete_it.qm | Bin 1268 -> 1275 bytes .../Gui/Resources/translations/Complete_it.ts | 4 ++-- .../Gui/Resources/translations/Complete_ja.qm | Bin 1084 -> 1091 bytes .../Gui/Resources/translations/Complete_ja.ts | 4 ++-- .../Gui/Resources/translations/Complete_nl.qm | Bin 1260 -> 1267 bytes .../Gui/Resources/translations/Complete_nl.ts | 4 ++-- .../Gui/Resources/translations/Complete_no.qm | Bin 1236 -> 1243 bytes .../Gui/Resources/translations/Complete_no.ts | 4 ++-- .../Gui/Resources/translations/Complete_pl.qm | Bin 1258 -> 1265 bytes .../Gui/Resources/translations/Complete_pl.ts | 4 ++-- .../Gui/Resources/translations/Complete_pt.qm | Bin 1322 -> 1329 bytes .../Gui/Resources/translations/Complete_pt.ts | 4 ++-- .../Gui/Resources/translations/Complete_ru.qm | Bin 1324 -> 1331 bytes .../Gui/Resources/translations/Complete_ru.ts | 4 ++-- .../Gui/Resources/translations/Complete_se.qm | Bin 1240 -> 1247 bytes .../Gui/Resources/translations/Complete_se.ts | 4 ++-- .../Gui/Resources/translations/Complete_uk.qm | Bin 1262 -> 1269 bytes .../Gui/Resources/translations/Complete_uk.ts | 4 ++-- .../Gui/Resources/translations/Complete_zh.qm | Bin 944 -> 951 bytes .../Gui/Resources/translations/Complete_zh.ts | 4 ++-- src/Mod/Complete/Gui/Workbench.cpp | 10 ++++----- src/Mod/Part/Gui/Workbench.cpp | 21 +++++++++--------- src/Mod/Sketcher/Gui/Workbench.cpp | 2 +- 37 files changed, 50 insertions(+), 51 deletions(-) diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_af.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_af.qm index 129a3fc9a727c21fba7019b3cf17a0f749bad1ed..4661e9716c343da2f74f2ba37d38769d663ab661 100644 GIT binary patch delta 80 zcmZqU>gAfCE5LH%&UXd|W&zfVr%nLrixYJvZ-aKmLz9PE?^d&+{IGE-oXG=%g6`-8w(g$ delta 66 zcmeC>YU7%qJJD7{f=m3?2?hq{i`*Ueo-;5oo#tL6?hd5?Zp?kcGMlUe27Isy4ZZWeNb)q81JS diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_af.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_af.ts index ad183f4d5..d1adc14ef 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_af.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_af.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Teken - Ske&tch + S&ketch &Skets diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_de.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_de.qm index 83e0263a6bb3866503fc3a9b55e4b8b633755048..11eb3fd4d09943745592899f26bccf326ba6bc77 100644 GIT binary patch delta 75 zcmbQnHJ59Gt^mu4JKq@?m^oN4o;m@fFHh9f;NV^(?#{r#baG?vBc{on%=VN0ndO;X eiqs|-GD}Q8!MvJTEjx8`8Os9p4hEnyMn(XcE*5V9 delta 66 zcmbQsHH~Y6?nGM+2`=$lCm0x*FLQU?d(ObXbdr0GxI2)~yfOC?)8sy8d1f`2qRAVW WB_{hb+fP2hyqY;XRc&$^%K`wrJ{3Oz diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_de.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_de.ts index 8543422ea..8b39f34e4 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_de.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_de.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Zeichnung - Ske&tch + S&ketch Ski&zze diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_es.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_es.qm index 11eeb5138ffbc47563f38b48423440bb168bf162..e0609785c17aa8abb5b3ee551628db945b4dac92 100644 GIT binary patch delta 73 zcmeyx*~m3PSAgZjo$m|`OkY?po;tz6z`TE=t_BD98gX}^*w&4?=a?qvGuuzLW|m}i cDN;);pFD&4II~)I>f|Jr8SEVlKt+s<0I22`yZ`_I delta 64 zcmZqV`o%dxccQI^1ef@&6ATQ@`?)*rJ!fEG+RD8~+#N{2+?acgX>t{_B&(WBQDXUI URp!vi>zFq(XQ!%7PGXq>0JC@%O#lD@ diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_es.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_es.ts index be0d66977..a4befd9fe 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_es.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_es.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing %Dibujo - Ske&tch + S&ketch Boc&eto diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_fi.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_fi.qm index 9f5dee744789df319c1ffc57abf03b1b421860c8..3a02f3bd993d636a2be7da723d3e36a79c8f4c64 100644 GIT binary patch delta 84 zcmcb^`IvKpt^mu4JKq@?nC`J&JavMBfqCUbT@4QIHRA3-vH2TwcQ8$kXSScL$}G?7 oQlyqxKAE3cZ1Ozj)og0nsU^u7lP9tWPflW~V((x8s%K;b0Jz^7ivR!s delta 71 zcmaFNd53d??nGM+2`=$lCm0x*S8{jUd(ObXG@pBoxI2)(xiNPK)8rIpc~&)-qQvsa b{LG<~=P|El%T84*NzRxY$SgcLiKPkvP~;aN diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_fi.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_fi.ts index 910ed1ee3..1dfd6c849 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_fi.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_fi.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Piirustus - Ske&tch + S&ketch Ske&tch diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_fr.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_fr.qm index 2c96f695df77c0047d791ea9d9d96b7701388928..0817a13e8bcbc0b465a4230fd76b238a2b8cdb0e 100644 GIT binary patch delta 75 zcmdnOwVP{#t^mu4JKq@?m{nLWo;m@fUryB3;NV^(?#{r#bbDj&7pBQmnLQ^bGD|YM e6sb+FWtNzHk9j?_T6XH>2`o$4I~ah<7#RV>_!nmY delta 64 zcmdnZwS{Yf?nGM+2`=$lCm0x*UvhWcd(ObXbensPxI2)~zcKd<)8tjmlB{YjMTzB; Uy_w@D-(z0SoSmvRc>>E40J5VMrvLx| diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_fr.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_fr.ts index 4cf54ae22..aedbd4a84 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_fr.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_fr.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Dessin - Ske&tch + S&ketch Es&quisse diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_hr.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_hr.qm index f4e9747ea89c8a9229c05fdcff5cd4075c258b35..85bf319cd961b762b6693beff0d7d09e16200a73 100644 GIT binary patch delta 73 zcmZqS>gJlDE5LH%&UXd|WglTdzbMjhga7~l delta 73 zcmeC?YT=roJJD7{f=m3?2?hq{)7%~Ro-;5ot>#`M?hd5yZp=NxG Workbench - &Drawing + Dr&awing &Crtež - Ske&tch + S&ketch Sk&ica diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_hu.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_hu.qm index 21c0a053a820f51530551ce2750053abc85f8830..6080e9c88d79d4555d3c82296bd319dc60533bb9 100644 GIT binary patch delta 77 zcmZ3$wVZ2$t^mu4JKq@?m}OWmo;m@fpHI});NV^(?#{r#bbe#*3#Q54%)XODnWb4> giqsOzC)+cNO}@drmRT)3b#e#G4E7ENph8AQ0N=kCivR!s delta 66 zcmZ3^wSa4a?nGM+2`=$lCm0x*pL2KId(ObXbe?;SxI2)~x-s_!)8s|W(#&cuMUxLO WOH2-B_MLo#c`b8xs@miZmKgxc`W3|h diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_hu.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_hu.ts index 8cee0ef4c..3210bbb88 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_hu.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_hu.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing Rajzolás - Ske&tch + S&ketch Vázlat diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_it.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_it.qm index 625eb325cd05b6d73301347b5644c6adc7e41e97..d4157f8fb9461a7ce3162eda00d44b0b537c2040 100644 GIT binary patch delta 82 zcmeyu`I~cst^mu4JKq@?n0~QdJavMBf%)h}T@4QIHRA3-vE3VUuP{w6XSSd0$Slq5 mQlvIHo>^k@Hs0 diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_it.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_it.ts index 48466f7e1..3f8e83425 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_it.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_it.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Disegno - Ske&tch + S&ketch S&ketch diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_ja.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_ja.qm index 8365b44eaa6bb43397ed9761b0d3322fe817203f..4954238143ccb53d27286a43a86fcb5473b58c0f 100644 GIT binary patch delta 84 zcmdnPahPL*t^mu4JKq@?n37m8o;tz6z$`jZSA&Cljkr5dOnzgo1=Hk*OwN;+GAXjU n6saYaPwr>>Uh1^^A-FRTvlw delta 71 zcmX@iv4>-V?nGM+2`=$lCm0x*MY%ifJ!fEGlILC{?hd4*H|AO}O@6_o$g1X2lvqBw bpDA*(3iD*P>{PXq-A diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_ja.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_ja.ts index 1bbd50762..0a05b50ae 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_ja.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_ja.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing ドローイング (&D) - Ske&tch + S&ketch スケッチ(&T) diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_nl.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_nl.qm index e80a5e90474e7985abdedc8071595e57b7bee542..51d5ff4fc60309291ef3ab9afd614911c8e13eef 100644 GIT binary patch delta 77 zcmaFE`I&Qqt^mu4JKq@?nC`J&JavMBfqC&nT@4QIHRA3-vH2TwcQ8$kX11TK$}G+5 hQlyqxKAE3cZ1ODTmCS0{sgvDUma%s*02MMa0ssRV7b*Y% delta 71 zcmey&`G#|X?nGM+2`=$lCm0x*7jt*qd(ObXG@pBoxI2)(x-oYL)8rIpX;w9tqQvsa b{LG<~XECp2%T84*NzRxY$SgcLhGhZ(R_qr% diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_nl.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_nl.ts index 4af85c543..c3d1b6a81 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_nl.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_nl.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Tekenen - Ske&tch + S&ketch Sche&ts diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_no.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_no.qm index de3d432d68dfd1d6043696965f507ea091de8068..5dd6372503acc352195aeb4f3386b867b486cd49 100644 GIT binary patch delta 73 zcmcb@d7E>Bt^mu4JKq@?m~OFNJavMBfqDK!T@4QIHRA3-v8fw#*D*~FWOkh_%`DC8 cQlyqxKDmMUAhTL_>SPy|3G5vVKt+s<0G6~B`v3p{ delta 66 zcmcc3d4+R=?nGM+2`=$lCm0x*=W}=5d(ObXG?jaexI2(Oy)kzk)8qtZX=XK-qRDm4 W5|gEwT_;atUd^1Hsy5k$WdZ=s0u Workbench - &Drawing + Dr&awing &Tegning - Ske&tch + S&ketch Sk&isser diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_pl.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_pl.qm index 20ac1afe70f5b866167a9fcad42bfc1da3ddeb20..959ad6b126ff1fc2740cfdbf8dfb040106df8c0a 100644 GIT binary patch delta 75 zcmaFG`H^#it^mu4JKq@?m|n47JavMBfqCsjT@4QIHRA3-v9%j>k1{ delta 66 zcmey!`HFLb?nGM+2`=$lCm0x**K&8 Workbench - &Drawing + Dr&awing &Rysunek - Ske&tch + S&ketch Szki&c diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_pt.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_pt.qm index 34a16816c5b2b47772ba9921fed7d735081f0c93..55f13d3b7c46434a978f13b69dadf56a230d8bb4 100644 GIT binary patch delta 72 zcmZ3*wUKLrt^mu4JKq@?nAKP>o;m@f-%r%l;NV^(?#{r#^n771^W??M_LFm&rCD8y b)Dp`lpJ6`Ctd^ZRc@oPE_6`Q18b(F{XiOFz delta 63 zcmdnUwTf$k?nGM+2`=$lCm0x*-*b1|d(ObX^qhN*xI2(9yD*n|@)~AoRyCKR#PZ4E T%%PJXF|TFLPF0&ciDd==ixd>D diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_pt.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_pt.ts index 90d092c66..408fba3d3 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_pt.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_pt.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Desenho - Ske&tch + S&ketch Sk&etch diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_ru.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_ru.qm index 517679124cbedfa50e2979596b906c86255d6aa9..b0977c27cc959a3f0740f602d53d9351118ebc70 100644 GIT binary patch delta 87 zcmZ3(wV7*zt^mu4JKq@?n59@Ro;m@fUr*H4;NV^(?#{r#barFzGp5PC%)XO@ndLcL niqsOzGxO3XKV%V}e2aNKn_6~iNpc35yNIQWy@LU$g^>{e99SG< delta 78 zcmdnYwT5eg?nGM+2`=$lCm0x*Uvqcdd(ObXbe4OKxI2)~zA^V1)8qxr@*HX|MTzB^ fdFhiMvItKOX7-(Yi+Md;cB)!Qat2sv5la^U0;wAG diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_ru.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_ru.ts index 28d46c787..ac8194f3c 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_ru.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_ru.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Рисование - Ske&tch + S&ketch Эс&киз diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_se.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_se.qm index f01b401a6a1543739df8ac1357a8dcd36e15161e..c3fc4c5445b6025ecf502da1ceffb479505491ff 100644 GIT binary patch delta 73 zcmcb?d7pEFt^mu4JKq@?m>#iSJavMBfqC&nT@4QIHRA3-v85Yx_c2XQWVW5G%`DC8 cQlyqxKDmQ=C$n01>SPy|DeN5#Kt+s<0Hb6UO8@`> delta 64 zcmcc5d4qF;?nGM+2`=$lCm0x*7jt*qd(ObXw3K^|xI2)(y)kzm)8q_hX;w9tqQvsa UqRhdQ=P@s4&Q4XE?7}hy0JBXL+yDRo diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_se.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_se.ts index fe2bf21e6..868c35e03 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_se.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_se.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing R&itning - Ske&tch + S&ketch S&kiss diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_uk.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_uk.qm index 6b81115345eb90cffbf99f7540cdcbbc8575d343..1aba32e8e70ed1a18e59c9cc41f63d66a98ce0a3 100644 GIT binary patch delta 77 zcmaFI`IU2mt^mu4JKq@?m>#iSJavMBfqDHzT@4QIHRA3-v56aVS20ZvWDcAx&MeRB hQlyqxKADkOZ1N)J)y!(ysgna(=COA$02MMa0ssP_7ajlr delta 64 zcmey$`Hpjf?nGM+2`=$lCm0x**K>E=d(ObXG?9CaxI2(Oy)kzc)8q_hc~&)-qQvsa UjLhki7csA9&Q4XE9KbRU0J;Aa0ssI2 diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_uk.ts b/src/Mod/Complete/Gui/Resources/translations/Complete_uk.ts index ecac8e183..49840b58c 100644 --- a/src/Mod/Complete/Gui/Resources/translations/Complete_uk.ts +++ b/src/Mod/Complete/Gui/Resources/translations/Complete_uk.ts @@ -32,11 +32,11 @@ Workbench - &Drawing + Dr&awing &Малювання - Ske&tch + S&ketch Ес&кіз diff --git a/src/Mod/Complete/Gui/Resources/translations/Complete_zh.qm b/src/Mod/Complete/Gui/Resources/translations/Complete_zh.qm index 8b3fc5bc23b9907f985b8d44bc75d2d737997206..e770a01e0f2c6022e705218b490653f31c6edfff 100644 GIT binary patch delta 87 zcmdnMzMXx7t^mu4JKq@?m{?dZo;m@fXHV4C;NV^(?#{r#czR>*6UNESOqP=anZ!9< niqsOzGxO3X7cz@X-pf?Ork0&rlAHnN1~bR9cQ638Gcp1I*vlFp delta 78 zcmdnazJYy$?nGM+2`=$lCm0x*W^;Gkd(ObXc$#~SxI2*kyD|3( Workbench - &Drawing + Dr&awing 图纸(&D) - Ske&tch + S&ketch 草绘(&T) diff --git a/src/Mod/Complete/Gui/Workbench.cpp b/src/Mod/Complete/Gui/Workbench.cpp index 80a0336dd..d2a5e5aaf 100644 --- a/src/Mod/Complete/Gui/Workbench.cpp +++ b/src/Mod/Complete/Gui/Workbench.cpp @@ -45,12 +45,12 @@ using namespace CompleteGui; #if 0 // needed for Qt's lupdate utility - qApp->translate("Workbench", "Ske&tch"); - qApp->translate("Workbench", "&Drawing"); + qApp->translate("Workbench", "S&ketch"); + qApp->translate("Workbench", "Dr&awing"); qApp->translate("Workbench", "&Raytracing"); qApp->translate("Workbench", "&Drafting"); qApp->translate("Workbench", "Sketch based"); - qApp->translate("Workbench", "Parametric"); + qApp->translate("Workbench", "Primitives"); qApp->translate("Workbench", "Object appearence"); qApp->translate("Workbench", "Wire Tools"); // taken from TestGui.py @@ -238,7 +238,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const // submenu boolean Gui::MenuItem* para = new Gui::MenuItem(); - para->setCommand("Parametric"); + para->setCommand("Primitives"); *para << "Part_Box" << "Part_Cylinder" << "Part_Sphere" @@ -306,7 +306,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const Gui::MenuItem* drawing = new Gui::MenuItem(menuBar); - drawing->setCommand("&Drawing"); + drawing->setCommand("Dr&awing"); *drawing << "Drawing_Open" << "Separator" diff --git a/src/Mod/Part/Gui/Workbench.cpp b/src/Mod/Part/Gui/Workbench.cpp index bceedc093..ea42cb9f3 100644 --- a/src/Mod/Part/Gui/Workbench.cpp +++ b/src/Mod/Part/Gui/Workbench.cpp @@ -58,11 +58,16 @@ Gui::MenuItem* Workbench::setupMenuBar() const Gui::MenuItem* root = StdWorkbench::setupMenuBar(); Gui::MenuItem* item = root->findItem("&Windows"); + Gui::MenuItem* prim = new Gui::MenuItem; + prim->setCommand("Primitives"); + *prim << "Part_Box" << "Part_Cylinder" << "Part_Sphere" + << "Part_Cone" << "Part_Torus"; + Gui::MenuItem* part = new Gui::MenuItem; root->insertItem(item, part); part->setCommand("&Part"); *part << "Part_Import" << "Part_Export" << "Separator"; - *part << "Part_Primitives" << "Part_ShapeFromMesh" + *part << prim << "Part_Primitives" << "Separator" << "Part_ShapeFromMesh" << "Part_MakeSolid" << "Part_ReverseShape" << "Part_SimpleCopy" << "Part_RefineShape" << "Separator" << "Part_Boolean" << "Part_CrossSections" << "Part_Extrude" @@ -70,16 +75,10 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Part_RuledSurface" << "Part_Loft" << "Part_Builder"; - Gui::MenuItem* partSimple = new Gui::MenuItem; - root->insertItem(item, partSimple); - partSimple->setCommand("&Simple"); - *partSimple << "Part_SimpleCylinder"; - - Gui::MenuItem* solids = new Gui::MenuItem; - root->insertItem(item, solids); - solids->setCommand("&Parametric"); - *solids << "Part_Box" << "Part_Cylinder" << "Part_Sphere" << "Part_Cone" - << "Part_Torus" << "Separator" << "Part_Primitives"; + //Gui::MenuItem* partSimple = new Gui::MenuItem; + //root->insertItem(item, partSimple); + //partSimple->setCommand("&Simple"); + //*partSimple << "Part_SimpleCylinder"; return root; } diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp index c196d63ce..15a285f52 100644 --- a/src/Mod/Sketcher/Gui/Workbench.cpp +++ b/src/Mod/Sketcher/Gui/Workbench.cpp @@ -57,7 +57,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const Gui::MenuItem* sketch = new Gui::MenuItem; root->insertItem(item, sketch); - sketch->setCommand("Ske&tch"); + sketch->setCommand("S&ketch"); Gui::MenuItem* geom = new Gui::MenuItem(); geom->setCommand("Sketcher geometries"); *geom /*<< "Sketcher_CreatePoint"*/