From e195db267c8754c2014d6afebb0f631eccb09063 2017-07-04 07:23:22 From: Alexandre Leroux Date: 2017-07-04 07:23:22 Subject: [PATCH] Adds icon for 'Plot' menu --- diff --git a/gui/include/Visualization/operations/MenuBuilder.h b/gui/include/Visualization/operations/MenuBuilder.h index d5ee390..cb78fb7 100644 --- a/gui/include/Visualization/operations/MenuBuilder.h +++ b/gui/include/Visualization/operations/MenuBuilder.h @@ -27,8 +27,9 @@ public: /** * Adds a new menu to the current menu * @param name the name of the menu + * @param icon the icon of the menu (can be null) */ - void addMenu(const QString &name); + void addMenu(const QString &name, const QIcon &icon = {}); /// Adds a separator to the current menu. The separator is added only if the menu already /// contains entries diff --git a/gui/resources/icones/plot.png b/gui/resources/icones/plot.png new file mode 100644 index 0000000000000000000000000000000000000000..bd783f0b1aa15db3d7b0fc906377baf9eb7b8ff1 GIT binary patch literal 2319 zc$@(b3GnubP)Vv8@pZF13U)w#HohPWHHhs&)vA1)Cb%FObA~cokI`s8u=U3 zC;bSVAG%^Xfu+Fj zEf)iS67DVg0hy^g3z_Tpp$j+~Sb@wm4g}P>+EZI2SVWlV+g{*d;3VR%RZK_T-c12C z4*`!x)>~;V#=r4*1GkfYDt0VzIbr%N4Qg3rtQed<0{VA?sHBOt31o z@SM!XZ%TI^)f-MtLf+&-%9m?da@84_Ncqp^UgY<8Y;x7^oD2Lyx$^x5oRVB|V#-eP zY(skWb>J{$#89T3TY#zQC8uF2bJT!4(Z{SDensz^hT$La&!CZ$luW`OBZk_ z0H&FRp`sU3)$+{2o_WBvtQRYe_Hp2{IMG~?0Fnr)+g zzxksv26zcwJq!Y;?N z70+twHyZ5>aHb-kH+_XPgfEaik}k}l0>LQS8Q?_6JoGgpdZY8`(7L!pxXLTqrWYp^7{#*y8?db$srSs45&NGJs~9a;K*T%_2&x z)Qaak^Yoobbgh%h4gWPDT=4ip(c6O3VR2q6t)kK=QdHGn3nb|>up z)8hI9WshE7WPpA}9u_ife_Ve;|B9-@fg-2&D)N|uM9eCS@3QD~E&khT;3JPbKlb>4 z!M%6yQ*S{iGQciH9!DTYq06FKL38D!Ncps{RHe#Tt8NhWUa0VS5AFl

O?!PP7(b)?_%N5UlPfd1Goq%p5MULZ6RX7?p6P?yf_=^C zUzN~Q!2ov`=xCJ&soAhu8y{$CVtu&{FazD&ujyP@f+^?Zpa}t6px`R>@Vof z7u1O^Bo=_CK7OVGn?QZ&LAE<<3jGc>{p5{;Hf-(?aCH`?fw=>H!5^Vn%f$=P-#NIR z^uyyQOh9hY)|%kX9AYCdAN^Nw0J&MMF=%_f|D;va`%7>(FQ{g{IsY$#JH8>s$f(#hzD zdL3ti#gxBcvmc4KU&UeK1?Yl4cC-m@!LMT0Q<0c?$imLkgl+haFhQA{v__^E$rm+i zDzc=jS@bd!jG*l8nj_QeNEp==qlIIE`$^OAjWvSWdjb%tU`)?y?tF;MY&CD$Wo*?e(*YC*Ylby&U z%^qY#(T$wXpN{(}-JGlgE=3oUp%$EqoHEY+menC;{}RMvD*uL(Z%Wc^j4=}ob0rdW zBzNQaqygYT;Bcg|%mhlNAsZ;m&K%}UpY#7E-AR}UN^=?#Q$Kg3x}+_@RkR+4nh89) zkm?#?Gjh~xv{8(iAOI&L*Qu6SZx5LUkwY6x(4BEK69i&1a--(k=x!_ZP2VDuS3bwJ z%mjfs7&$@nIC7FUWXEwkGBmvbI5ME-TAH9Pd-SFtCzaeyTmE8I_zkC>39RuugjOb4kyVkAoJqhd pz;D2{nY9>(VHk#C7=}?R{ssq@VDHBZ4Ql`Z002ovPDHLkV1nbSE))O& literal 0 Hc$@icones/delete.png icones/openInspector.png icones/next.png + icones/plot.png icones/previous.png diff --git a/gui/src/Visualization/operations/GenerateVariableMenuOperation.cpp b/gui/src/Visualization/operations/GenerateVariableMenuOperation.cpp index dec20d8..4e93dae 100644 --- a/gui/src/Visualization/operations/GenerateVariableMenuOperation.cpp +++ b/gui/src/Visualization/operations/GenerateVariableMenuOperation.cpp @@ -21,7 +21,7 @@ struct GenerateVariableMenuOperation::GenerateVariableMenuOperationPrivate { void visitRootEnter() { // Creates the root menu - m_MenuBuilder.addMenu(QObject::tr("Plot")); + m_MenuBuilder.addMenu(QObject::tr("Plot"), QIcon{":/icones/plot.png"}); } void visitRootLeave() diff --git a/gui/src/Visualization/operations/MenuBuilder.cpp b/gui/src/Visualization/operations/MenuBuilder.cpp index 23b8e01..3d21803 100644 --- a/gui/src/Visualization/operations/MenuBuilder.cpp +++ b/gui/src/Visualization/operations/MenuBuilder.cpp @@ -12,10 +12,10 @@ MenuBuilder::MenuBuilder(QMenu *menu) } } -void MenuBuilder::addMenu(const QString &name) +void MenuBuilder::addMenu(const QString &name, const QIcon &icon) { if (auto currMenu = currentMenu()) { - m_Menus.push(currMenu->addMenu(name)); + m_Menus.push(currMenu->addMenu(icon, name)); } else { qCCritical(LOG_MenuBuilder()) << QObject::tr("No current menu to attach the new menu");