diff options
| author | gregory guy <g-gregory@gmx.fr> | 2018-11-03 12:43:22 +0100 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-11-08 11:05:34 +0900 |
| commit | 5645327be1ca767584cc95d9aab4790be9a672e6 (patch) | |
| tree | 1e40ec66ab888b29546f61ef76ae30168b155ea1 | |
| parent | e40c895e26526277ebc0069053927d0e050e07a3 (diff) | |
| download | tdebase-5645327be1ca767584cc95d9aab4790be9a672e6.tar.gz tdebase-5645327be1ca767584cc95d9aab4790be9a672e6.zip | |
rename kdelogo into tdelogo
Signed-off-by: gregory guy <g-gregory@gmx.fr>
(cherry picked from commit 28c1ae5ff73808543bacf605222ab8b895cd99e8)
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | kcontrol/tdm/tdm-appear.cpp | 2 | ||||
| -rw-r--r-- | tdm/config.def | 2 | ||||
| -rw-r--r-- | tdm/kfrontend/pics/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdm/kfrontend/pics/Makefile.am | 2 | ||||
| -rw-r--r-- | tdm/kfrontend/pics/tdelogo.png (renamed from tdm/kfrontend/pics/kdelogo.png) | bin | 13438 -> 13438 bytes |
5 files changed, 4 insertions, 4 deletions
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/tdelogo.png Binary files differindex 647b5c6ea..647b5c6ea 100644 --- a/tdm/kfrontend/pics/kdelogo.png +++ b/tdm/kfrontend/pics/tdelogo.png |
