From 5e2433714894aa8ef4a21a3bb03308cdc1ff2262 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 14 Apr 2021 20:37:25 +0900 Subject: [PATCH] Use new 'window_duplicate' icon in tdelibs Signed-off-by: Michele Calgaro (cherry picked from commit 6408069d61cedcbde78a14e562857b9f34b48903) --- kdesktop/krootwm.cpp | 2 +- kicker/applets/minipager/pagerbutton.cpp | 2 +- kicker/data/icons/Makefile.am | 2 +- kicker/data/icons/cr16-app-window_list.png | Bin 823 -> 0 bytes kicker/data/icons/cr32-app-window_list.png | Bin 1924 -> 0 bytes kicker/data/icons/cr48-app-window_list.png | Bin 2401 -> 0 bytes kicker/extensions/kasbar/kasprefsdlg.cpp | 2 +- kicker/kicker/buttons/windowlist.desktop | 2 +- kicker/kicker/buttons/windowlistbutton.cpp | 2 +- kicker/kicker/core/container_button.h | 2 +- ksplashml/themeengine/objkstheme.cpp | 2 +- ktip/tips | 2 +- 12 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 kicker/data/icons/cr16-app-window_list.png delete mode 100644 kicker/data/icons/cr32-app-window_list.png delete mode 100644 kicker/data/icons/cr48-app-window_list.png diff --git a/kdesktop/krootwm.cpp b/kdesktop/krootwm.cpp index 4010c1f22..62ee673e0 100644 --- a/kdesktop/krootwm.cpp +++ b/kdesktop/krootwm.cpp @@ -450,7 +450,7 @@ void KRootWm::buildMenus() TQPopupMenu* pWindowOperationsMenu = new TQPopupMenu; m_actionCollection->action("cascade")->plug( pWindowOperationsMenu ); m_actionCollection->action("unclutter")->plug( pWindowOperationsMenu ); - desktopMenu->insertItem(SmallIconSet("window_list"), i18n("Windows"), pWindowOperationsMenu); + desktopMenu->insertItem(SmallIconSet("window_duplicate"), i18n("Windows"), pWindowOperationsMenu); if (m_bDesktopEnabled) { diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index 3e51a199e..e9f42e18a 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -829,7 +829,7 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data) } data.duration = 4000; - data.icon = DesktopIcon("window_list", TDEIcon::SizeMedium); + data.icon = DesktopIcon("window_duplicate", TDEIcon::SizeMedium); data.message = TQStyleSheet::escape(m_desktopName); data.direction = m_pager->popupDirection(); } diff --git a/kicker/data/icons/Makefile.am b/kicker/data/icons/Makefile.am index 4bc51ce73..a8a6a18cd 100644 --- a/kicker/data/icons/Makefile.am +++ b/kicker/data/icons/Makefile.am @@ -1,3 +1,3 @@ -KDE_ICON = kdisknav package_favourite panel window_list kmenu kicker +KDE_ICON = kdisknav package_favourite panel kmenu kicker SUBDIRS = actions diff --git a/kicker/data/icons/cr16-app-window_list.png b/kicker/data/icons/cr16-app-window_list.png deleted file mode 100644 index 33439e716ebde8ba46f8eff172edd74484d73465..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 823 zcmV-71IYY|P)004R=004l4008;_004mL004C`008P>0026e000+nl3&F}00009 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 KMNUMnLSTY#dUP-V diff --git a/kicker/data/icons/cr48-app-window_list.png b/kicker/data/icons/cr48-app-window_list.png deleted file mode 100644 index f19da6616eb41da996940a6724209eba3bc5c6e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2401 zcmV-n37+004R=004l4008;_004mL004C`008P>0026e000+nl3&F}00009 za7bBm000XU000XU0RWnu7ytkW*GWV{RA}DST3u*VM--mj{2CJzNi-PL!~`m+K~SVE z5`3v>p?$C~c~Yn^Dkz944fa9lt3pdlUj#`Dl1iF}5Q<8g2(f4l5|cbgQ`8uL5>1Sn z|LpGl+n#UkoZZQFlk9HRP%jKKxp(fp-*?V;&YZa$UpO2V@AKgo@A;8F--Yt>^0*(; z*4DN?Gc&W-ah!&;XU`sLX=$-muU_rEHy+5&&h9h}L(I&~RM*zlhB`YtuWsGCHG6Dq z%>Tb9aOKLC8Umi}^Z7(sS((Vn$`TV36Z_7bITN^X<3{tlCgPhfh~t!y@7lF%mT8*) zKp-G&+ZL-#bRh^NW6UcQh-=qUS8X=W5+&!^yrb9YH2NrKwVv3aZypxFu+@u zB_Jd8L&9k$!f_e#_ ziGT$9{QP`L1l|}O9hDv-(tlM~SMQ@o7$mQRh zaryFPNd)glVnHPoMrkCz23>TeoigLDuL$Ps;Vk^jZ(KHgFt`%`n9-u^JY$Zya1Y-ntnzOPX;{8f&uGU z2?x zcWl~}9q7DeqlM);!*Y9z=HYzgZ@O;D`yda;m5GDi)xD#}k)Tz5OY2q9{_Rc)lD&%_ z*2aoXX(9)o;9zOb;+X>V`eO;bl9AwK|rQkfkgU=T1<1Be#1+;PwlG!Bap#%5Rq z40nuPHq$R=X->ejg%KjF+Xnq@ko8RwqGp&D_0&xAhGlbn$?6p;6Iq9|(1r~g1QoBc z#-aowi$Rd1nE8orLl!b50a&lG-;#jY@}}+fxMnEuhV2r-dBencx(7f_NW@Z7i8cp1 zH=|{QL-)1Rek6K^Z1MH^--XC467W2&wsW$Ko?1Z)F@hMlbmj&xbj3OZ=Bqfm_G$X+Z>yrZH82ZNbkg3MdKe@xQ zT|HaW4AUKFsInQ_hPBdV3GI$8@{rG_hi0Y=pXGBa)X7l^lCu)#fdDUP+)%Cd_xD5l zKkC*;97qDN>Y)#FQoiBlT1VdxaLvQ%wc=1y zC19ui>l|+_0ZK0q^h#7;1DFKJ@?6YAI>ky&{V&SuAOIO5g@t9}HLTQv$36fJu6I1K zqFYu6t1ouk@Hff_T2!YVJb2Kkzz3A|oyeCt+ewWF)W@wkwU47^A_lMT1^7Id7QC3T z^`AX^hC1ki0zRu*Kl*7g6&^q!dck`uP#wHC9x#Rh^!UMt0$9Jdx3@)sM>ADIixRMw z=mESKX;7~s8N4@Wb?Y-xmJfQq52+O!ASx$*P{3LHmQKL$2JzA|4PM4_(4_-Fy0uv* zyvb*aGdW%R*eh(@xG_lOL+gCj*J2=f0+W-Ik&TCLZSPi*_W`lwqX#v57zDdD>MwXQ zkL4wxvQTmo!V9@1#*0BhUp>9LXAiJsI18~S`5LOw_3PIgR4#MP6NqK~2!Uih0824I z*0MM2c)tnhK(R(}`OF@G_EcsIoW^erG?=cWfRYaie_2H1nh zVyH|@N=mHm?(RCx`bI44M+rDiQj1lrjd-kl&mPcsW!&R<`t)h!UMzm}cbx(rsd-{q zKN7@Ff&^lL*Hb0V0U+z1!E=N4^|Aq5Md*Ibnl-36E!s}jd$m8`=YBT^5(on1dwnnK zU2&NNd%*jFSKk+-VIHN*FAE9^dTFEX^!4?fSGtc_e?Iv{JP^-Mt(XJ%vgP?4^v{63 zHM|}NEF1mD5D-w$8>77c6>a8&G{#G&w7l;u`YUC~v=;rU;Qe0X{pQ0Bz`PlUgO)$J zdxMyaFizcsvV2IZd(4HbA0;r)Qp{i(xc*6nuX(FYT{_;Mome_df+Ym2Q$L|BA5yYe z6#SwRV!-J2F%ImUIAA%Lz53VlJzJcCN3)O{hV%?WSv{nHhvO#Ddi_sPczy0>dQOJX z_Na3=-E+O+?dLNNKiB6=(=mpX-V>_K@L?;P`h04|s?S>H{}u>2ejnsBf;gajA58RL z4Q#d2O{;Sm%S^yj?=}*(J`-?M)C-jb(w3P38!)g~%3O$msUEc4;B^vCG6enuXKD=+ TDjU!X00000NkvXXu0mjfo)>WJ diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index 28c6fca72..729fda525 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -287,7 +287,7 @@ void KasPrefsDialog::addThumbsPage() void KasPrefsDialog::addBehavePage() { - TQVBox *behavePage = addVBoxPage( i18n("Behavior"), TQString::null, Icon( "window_list" ) ); + TQVBox *behavePage = addVBoxPage( i18n("Behavior"), TQString::null, Icon( "window_duplicate" ) ); groupWindowsCheck = new TQCheckBox( i18n("&Group windows"), behavePage ); TQWhatsThis::add( groupWindowsCheck, diff --git a/kicker/kicker/buttons/windowlist.desktop b/kicker/kicker/buttons/windowlist.desktop index 94c035def..1ffb96610 100644 --- a/kicker/kicker/buttons/windowlist.desktop +++ b/kicker/kicker/buttons/windowlist.desktop @@ -3,5 +3,5 @@ Name=Window List Menu Comment=A menu that lists all open windows -Icon=window_list +Icon=window_duplicate X-TDE-Library=WindowListButton diff --git a/kicker/kicker/buttons/windowlistbutton.cpp b/kicker/kicker/buttons/windowlistbutton.cpp index f1c72904e..cbcfd4b75 100644 --- a/kicker/kicker/buttons/windowlistbutton.cpp +++ b/kicker/kicker/buttons/windowlistbutton.cpp @@ -38,7 +38,7 @@ WindowListButton::WindowListButton( TQWidget* parent ) setTitle(i18n("Window List")); TQToolTip::add(this, i18n("Window list")); - setIcon("window_list"); + setIcon("window_duplicate"); } void WindowListButton::initPopup() diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h index bc24272db..1e48989c1 100644 --- a/kicker/kicker/core/container_button.h +++ b/kicker/kicker/core/container_button.h @@ -151,7 +151,7 @@ public: WindowListButtonContainer(const TDEConfigGroup& config, TQPopupMenu* opMenu, TQWidget* parent = 0); WindowListButtonContainer(TQPopupMenu* opMenu, TQWidget* parent = 0); TQString appletType() const { return "WindowListButton"; } - virtual TQString icon() const { return "window_list"; } + virtual TQString icon() const { return "window_duplicate"; } virtual TQString visibleName() const { return i18n("Windowlist"); } bool isAMenu() const { return true; } }; diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp index 9de990099..609956592 100644 --- a/ksplashml/themeengine/objkstheme.cpp +++ b/ksplashml/themeengine/objkstheme.cpp @@ -118,7 +118,7 @@ bool ObjKsTheme::loadTDEConfig( TDEConfig *cfg, const TQString& activeTheme, boo m_icons.append( cfg->readEntry( "Icon1", "filetypes" ) ); m_icons.append( cfg->readEntry( "Icon2", "application-x-executable" ) ); m_icons.append( cfg->readEntry( "Icon3", "key_bindings" ) ); - m_icons.append( cfg->readEntry( "Icon4", "window_list" ) ); + m_icons.append( cfg->readEntry( "Icon4", "window_duplicate" ) ); m_icons.append( cfg->readEntry( "Icon5", "desktop" ) ); m_icons.append( cfg->readEntry( "Icon6", "style" ) ); m_icons.append( cfg->readEntry( "Icon7", "preferences-system" ) ); diff --git a/ktip/tips b/ktip/tips index cd825802e..6bf46a166 100644 --- a/ktip/tips +++ b/ktip/tips @@ -77,7 +77,7 @@ The window list, which is accessible via an icon on the panel, provides a quick overview of all windows on all virtual desktops. Alternatively, press Alt+F5 to display the window list.


- +