summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgregory guy <g-gregory@gmx.fr>2018-11-03 11:43:22 (GMT)
committer TDE Gitea <gitea@mirror.git.trinitydesktop.org>2018-11-08 01:50:15 (GMT)
commit28c1ae5ff73808543bacf605222ab8b895cd99e8 (patch)
tree5a0189085ead0432f3a64094c0520bd6bd36502b
parentf067dfc575173d45c0c3cd5732e0f7b69edd6fb5 (diff)
downloadtdebase-28c1ae5f.zip
tdebase-28c1ae5f.tar.gz
rename kdelogo into tdelogo
Signed-off-by: gregory guy <g-gregory@gmx.fr>
-rw-r--r--kcontrol/tdm/tdm-appear.cpp2
-rw-r--r--tdm/config.def2
-rw-r--r--tdm/kfrontend/pics/CMakeLists.txt2
-rw-r--r--tdm/kfrontend/pics/Makefile.am2
-rw-r--r--tdm/kfrontend/pics/tdelogo.png (renamed from tdm/kfrontend/pics/kdelogo.png)bin13438 -> 13438 bytes
5 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index cfd0084..c248cff 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 29a023a..124887f 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 e00e0e9..29cc306 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 5724008..2e11030 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
index 647b5c6..647b5c6 100644
--- a/tdm/kfrontend/pics/kdelogo.png
+++ b/tdm/kfrontend/pics/tdelogo.png
Binary files differ