From 5e2433714894aa8ef4a21a3bb03308cdc1ff2262 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 14 Apr 2021 20:37:25 +0900 Subject: 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 33439e716..000000000 Binary files a/kicker/data/icons/cr16-app-window_list.png and /dev/null differ diff --git a/kicker/data/icons/cr32-app-window_list.png b/kicker/data/icons/cr32-app-window_list.png deleted file mode 100644 index 2de7c18db..000000000 Binary files a/kicker/data/icons/cr32-app-window_list.png and /dev/null differ 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 f19da6616..000000000 Binary files a/kicker/data/icons/cr48-app-window_list.png and /dev/null differ 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.


- +
-- cgit v1.2.3