# HG changeset patch # User Torsten # Date 1381345600 -7200 # Node ID 4288b90f18c429946a72de28a219f234ee87ac7e # Parent 77eff9c6fb09e3197677f4725966383415c0daa9 icons for news and release notes widgets * letter_logo_NewsDockWidget.png, graphic_logo_NewsDockWidget.png, letter_logo_ReleaseWidget.png, graphic_logo_ReleaseWidget.png: new icons * libgui/module.mk: new icons files added * resource.qrc: new icons files added * main-window.cc(display_url_in_window): set window title and icon; (notice_settings): set the desired icon for the release notes widget * main-window.h: new variable for icon of release notes widget diff --git a/libgui/src/icons/graphic_logo_NewsDockWidget.png b/libgui/src/icons/graphic_logo_NewsDockWidget.png new file mode 100644 index 0000000000000000000000000000000000000000..473158d6a9fdd880b4d3129aa8e2919b31ac79fe GIT binary patch literal 1589 zc$@(>2Fm$~P)Px#24YJ`L;zp_U;toc6lO{Q000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*z@ z5(xtWrEix200p&4L_t(o!^M|vjFr_9$N&GC^Xz@wr7S4Bx&$l|0ti8aidv*gO|>dC zbfcuL@r8a-Bk?`#7hn6Oxd>`oQz+UXmY`^j1!I~T0?}d%tc$w4TJQw{5qE`^W!Yu# z+jFKL?!B<+Uc47+oaD)!JojYgH}lMybB6d9X?*Sdz^OE-@J1nKsPFPvp;QGsx%m&s((nwy(B^VN>?lx$YvjVgo)Ap}GSC80t{;kTf#A^DUF z+E>jur|*;jE_kI~Bec0HTqWc%At3@&5$2r(BJ5VOTZK6lQ4v%t*-(I7E9BBuGtOx_ zC4lKKzjvDwPl_-iLeo3|^U=zCD)^_8?}+e26{eiBij+DbrYJdGgjWlhRzY(6MPrw@ zkppD|Ok2Bswy3NY;_Q6nG$kp*tO}N?$g+)BPu@|=;4e3SS|wr^3)uu0+}^Nn+Y8tK zrRmQA0Kwsa_;}hnWQPQp{QUMh6+9!v9HBr2CM5IG@L>(`E=zXJ*ad-d*niv2cacT>S>lQ6q^qrh9Uc4BA9uHiKN)8wudYc)V z!RH_I-Xk>o>$axz`*9lOqgmH#Q9qV}M7n20DySYqPZ$Xk(1eI&jy^qu=e*XXmps#%7!d9~?Gv-Odpyy@)@ZLj2 zhRi^@P#(B~X6pd7x*!PdsH?9B%gsP1b~_MBw5n1a~iAkTbIm$*$M#bNj_36!jn2Lww7`L%E`doUc%p6f8N^;pvHMvN+EZjzhv2f ztDa68K}BzLWTGq4Fz^1uZ=J>(uuJKo4gjXF$IcV}oqgF-MQ(+V)k2sG7=+oY{v8>8 zN{7)mV9nwK8~4tPASWd&U!T~xULbP{w_qxXfQH}A8joA2o?Y3N%Vp8mwgG)@8}N2Z zE9kq|?LBkaRUeJHJX#V!mTrmw)*B6FdK!UBht*5?^(9m*0N%@l6+vx5L|Z>u?N)$PX=fJ>~?Xt0SncQUogK%X%D0 zWia(X3!ZCR2sidT!24qW2fMl|>;DfVAGdg86Bf68hKx6;0!l$~Tsxi_IRUUP-HG3} z+=q$TeaK0WcWQ>C0|PrM0!Sv476RyE0$W`@+N(yvu{g9AAhh7TIK+y;(NLT1!G(u* zU_#&L_*qBt+$@FJtnaV%J|GHI|9;WJBhf#+p=zizVxbx47%{~Iq#0<18=V0(8wkng nx+7;S`QyEJetg2s5WxQc3^hu3hoJgH00000NkvXXu0mjf!_V#k diff --git a/libgui/src/icons/graphic_logo_ReleaseWidget.png b/libgui/src/icons/graphic_logo_ReleaseWidget.png new file mode 100644 index 0000000000000000000000000000000000000000..c392857905d2edc3f46a43c46c2cbcd9b4e69cee GIT binary patch literal 1594 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 Uel&RuiU0rr07*qoM6N<$f>+m?e*gdg diff --git a/libgui/src/icons/letter_logo_ReleaseWidget.png b/libgui/src/icons/letter_logo_ReleaseWidget.png new file mode 100644 index 0000000000000000000000000000000000000000..3f2dd3d761dc727783bd40d84a005ae80ae665a3 GIT binary patch literal 1937 zc$@)|2X6R@P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*z@ z5i%IIH1`?+00$9CL_t(o!=0CVj8(-Q$3MT{oOAa+c<;(C4@F=V6cmBV;+81T`iOv4 zT576A?O!(0T3egi)YLYOwP`A?nkKdO5!VjTUnGw#A=D+?)7&sm0RF+05kuQb`@evoJxa=3{w$Q!KohY9EOI<@IVQjAfn_kG7$riD^+AgL*2z6o)^IE zzyJ5UPIyvPDpbXsh^T^!FfkQ!)$kY-lL0jqj+hD&MpqFI=OYgGd782jeI~6=`OTKA zCp^wL4oRor!q27pf0zd~Vra zm;MO=r85+E%~(ZYP=L!{+EVS5zo@WSMH%oqro!?GL;3pnA?Gr`_;k-UVk;kDQm%QA zV3y0}rKhLo=a;RFUKseN%oT4|ZxIVs1*abK3Tn(56+h?B0VcKYBGK2($jZt|0GUjN zLLoox)!C6-vYDt1ptfOSBJzH|iX`!XfvJ&n%1`BnoDw?9Ir(c2*7p@yUze=QE77+mv#-*yrS6@P`cJ480&3Jp&OXRY>rxoCug^RfDk@cwd z3!MZu?zazyb{$%F&j!OZ`37QcDU0PROUqc_u4dT;x@mB+rn`~9Rx$W8o)~wmYcI?h0I)Ni4Nf)wgQY1~%;wJfenKL3>hL`xP`uf2HM27Z zG?CI|Ja_`Y+=VxD{cU$rJMF5{x9yFac;#Nm<@)^7BLVE}$Wwi_HS2&8#s>l!(a0*8bb+O{}t>x?a z1b~Wog2|U%$&U190QPK4lgsuJPb5zQXv{ha66oN|@WJ|*`2Cu1VY(OrLnIPm^QYUH zay-Dq+LM}2n^ji=h@v7*jhmQJcP+WCZ;{`&9@T*6T%H9TIhw{@bLyq1E7n$kZB>z4 zr(&uiP6X$KM`u=ZSMA8NjvdA3Psl&Dm`q2)%_Nga;>je5M4WgcK`fbK$cT}mr)~J71x+S)hxc|U zG81o@H}GaO>}==m^#^$4U^fSPP7e}^0EV0pbIc5PM*P*!?~)tt-hxP-zyY;((Ivu7860o?D_ zUai8fRpcwG$F5^;;O?M8JP^hvLQ6AGN$echS?9_k5A}WQra$!K2=PDR6CXXRb;WMOjkjUyD1M0Q`V_GFY2DyamTEaw$lFt Xi(S~%ECMWe00000NkvXXu0mjf_A9Qm diff --git a/libgui/src/main-window.cc b/libgui/src/main-window.cc --- a/libgui/src/main-window.cc +++ b/libgui/src/main-window.cc @@ -268,6 +268,8 @@ vlayout->addWidget (browser); w->setLayout (vlayout); + w->setWindowTitle (tr ("Octave Release Notes")); + w->setWindowIcon (QIcon (_release_notes_icon)); w->show (); w->raise (); w->activateWindow (); @@ -368,6 +370,11 @@ widget->setWindowIcon (QIcon (icon)); } } + if (widget_icon_data[icon_set_found].name != "NONE") + _release_notes_icon = widget_icon_data[icon_set_found].path + + "ReleaseWidget.png"; + else + _release_notes_icon = ":/actions/icons/logo.png"; int icon_size = settings->value ("toolbar_icon_size",24).toInt (); _main_tool_bar->setIconSize (QSize (icon_size,icon_size)); diff --git a/libgui/src/main-window.h b/libgui/src/main-window.h --- a/libgui/src/main-window.h +++ b/libgui/src/main-window.h @@ -291,6 +291,8 @@ return list; } + QString _release_notes_icon; + QToolBar *_main_tool_bar; QMenu *_debug_menu; diff --git a/libgui/src/module.mk b/libgui/src/module.mk --- a/libgui/src/module.mk +++ b/libgui/src/module.mk @@ -36,8 +36,10 @@ src/icons/graphic_logo_FileEditor.png \ src/icons/graphic_logo_FilesDockWidget.png \ src/icons/graphic_logo_HistoryDockWidget.png \ + src/icons/graphic_logo_NewsDockWidget.png \ src/icons/graphic_logo_TerminalDockWidget.png \ src/icons/graphic_logo_WorkspaceView.png \ + src/icons/graphic_logo_ReleaseWidget.png \ src/icons/help_index.png \ src/icons/home.png \ src/icons/icons_license \ @@ -46,8 +48,10 @@ src/icons/letter_logo_FileEditor.png \ src/icons/letter_logo_FilesDockWidget.png \ src/icons/letter_logo_HistoryDockWidget.png \ + src/icons/letter_logo_NewsDockWidget.png \ src/icons/letter_logo_TerminalDockWidget.png \ src/icons/letter_logo_WorkspaceView.png \ + src/icons/letter_logo_ReleaseWidget.png \ src/icons/logo.png \ src/icons/ok.png \ src/icons/question.png \ diff --git a/libgui/src/resource.qrc b/libgui/src/resource.qrc --- a/libgui/src/resource.qrc +++ b/libgui/src/resource.qrc @@ -46,16 +46,20 @@ icons/db_stop.png icons/letter_logo_FilesDockWidget.png icons/letter_logo_FileEditor.png + icons/letter_logo_NewsDockWidget.png icons/letter_logo_TerminalDockWidget.png icons/letter_logo_HistoryDockWidget.png icons/letter_logo_WorkspaceView.png icons/letter_logo_DocumentationDockWidget.png + icons/letter_logo_ReleaseWidget.png icons/graphic_logo_FilesDockWidget.png icons/graphic_logo_FileEditor.png + icons/graphic_logo_NewsDockWidget.png icons/graphic_logo_TerminalDockWidget.png icons/graphic_logo_HistoryDockWidget.png icons/graphic_logo_WorkspaceView.png icons/graphic_logo_DocumentationDockWidget.png + icons/graphic_logo_ReleaseWidget.png icons/widget-close.png icons/widget-dock.png icons/widget-undock.png