From 5645327be1ca767584cc95d9aab4790be9a672e6 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Sat, 3 Nov 2018 12:43:22 +0100 Subject: rename kdelogo into tdelogo Signed-off-by: gregory guy (cherry picked from commit 28c1ae5ff73808543bacf605222ab8b895cd99e8) Signed-off-by: Michele Calgaro --- kcontrol/tdm/tdm-appear.cpp | 2 +- tdm/config.def | 2 +- tdm/kfrontend/pics/CMakeLists.txt | 2 +- tdm/kfrontend/pics/Makefile.am | 2 +- tdm/kfrontend/pics/kdelogo.png | Bin 13438 -> 0 bytes tdm/kfrontend/pics/tdelogo.png | Bin 0 -> 13438 bytes 6 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 tdm/kfrontend/pics/kdelogo.png create mode 100644 tdm/kfrontend/pics/tdelogo.png diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index cfd008481..c248cff57 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -355,7 +355,7 @@ void TDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo) bool TDMAppearanceWidget::setLogo(TQString logo) { TQString flogo = logo.isEmpty() ? - locate("data", TQString::fromLatin1("tdm/pics/kdelogo.png") ) : + locate("data", TQString::fromLatin1("tdm/pics/tdelogo.png") ) : logo; TQImage p(flogo); if (p.isNull()) diff --git a/tdm/config.def b/tdm/config.def index 29a023a7f..124887f20 100644 --- a/tdm/config.def +++ b/tdm/config.def @@ -2061,7 +2061,7 @@ Key: LogoPixmap Type: string Default: "" User: greeter(logo) -Instance: */TDMDATA "/pics/kdelogo.png" +Instance: */TDMDATA "/pics/tdelogo.png" Comment: The image to show when LogoArea=Logo. Description: diff --git a/tdm/kfrontend/pics/CMakeLists.txt b/tdm/kfrontend/pics/CMakeLists.txt index e00e0e906..29cc30672 100644 --- a/tdm/kfrontend/pics/CMakeLists.txt +++ b/tdm/kfrontend/pics/CMakeLists.txt @@ -10,7 +10,7 @@ ################################################# install( FILES - kdelogo.png shutdown.jpg + tdelogo.png shutdown.jpg DESTINATION ${DATA_INSTALL_DIR}/tdm/pics ) install( FILES diff --git a/tdm/kfrontend/pics/Makefile.am b/tdm/kfrontend/pics/Makefile.am index 572400804..2e1103098 100644 --- a/tdm/kfrontend/pics/Makefile.am +++ b/tdm/kfrontend/pics/Makefile.am @@ -1,6 +1,6 @@ picsdir = $(kde_datadir)/tdm/pics -pics_DATA = kdelogo.png kdelogo-crystal.png shutdown.jpg +pics_DATA = tdelogo.png shutdown.jpg usersdir = $(picsdir)/users users_DATA = default1.png default2.png default3.png default4.png root1.png diff --git a/tdm/kfrontend/pics/kdelogo.png b/tdm/kfrontend/pics/kdelogo.png deleted file mode 100644 index 647b5c6ea..000000000 Binary files a/tdm/kfrontend/pics/kdelogo.png and /dev/null differ diff --git a/tdm/kfrontend/pics/tdelogo.png b/tdm/kfrontend/pics/tdelogo.png new file mode 100644 index 000000000..647b5c6ea Binary files /dev/null and b/tdm/kfrontend/pics/tdelogo.png differ -- cgit v1.2.1