Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 47 insertions, 0 deletions

diff --git a/kdesktop/pics/Makefile.am b/kdesktop/pics/Makefile.am
new file mode 100644
index 000000000..79bb5381a
--- /dev/null
+++ b/kdesktop/pics/Makefile.am
@@ -0,0 +1,9 @@
+# Makefile.am of kdebase/kdesktop/pics
+
+pics_DATA = ksslogo.png splash.png splash2.png kde2.xbm
+
+picsdir = $(kde_datadir)/kdesktop/pics
+
+EXTRA_DIST = $(pics_DATA)
+
+KDE_ICON = error
diff --git a/kdesktop/pics/cr32-app-error.png b/kdesktop/pics/cr32-app-error.png
new file mode 100644
index 000000000..1de7a6fda
--- /dev/null
+++ b/kdesktop/pics/cr32-app-error.png
diff --git a/kdesktop/pics/kde2.xbm b/kdesktop/pics/kde2.xbm
new file mode 100644
index 000000000..0eced4666
--- /dev/null
+++ b/kdesktop/pics/kde2.xbm
@@ -0,0 +1,38 @@
+#define kde2_width 64
+#define kde2_height 64
+static char kde2_bits[] = {
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
+ 0x0f,0x80,0x01,0x00,0x00,0x00,0x00,0xf8,0x0f,0x80,0x1f,0x00,0x00,0x00,0x00,
+ 0xf8,0x0f,0xc0,0xff,0x01,0x00,0x00,0x00,0xf8,0x0f,0xe0,0xff,0x00,0x00,0x00,
+ 0x00,0xf8,0x0f,0xf0,0xff,0x00,0x00,0x00,0x00,0xf8,0x0f,0xf0,0x7f,0x00,0x00,
+ 0x00,0x00,0xf8,0x0f,0xf8,0x3f,0x00,0x00,0x00,0x03,0xf8,0x0f,0xfc,0x1f,0x00,
+ 0x00,0x80,0x07,0xf8,0x0f,0xfe,0x1f,0x00,0x00,0xc0,0x1f,0xf9,0x0f,0xff,0x0f,
+ 0x00,0x00,0xe0,0xbf,0xf9,0x0f,0xff,0x07,0x00,0x00,0xc0,0xff,0xf9,0x8f,0xff,
+ 0x03,0x00,0x00,0x80,0xff,0xf9,0xcf,0xff,0x01,0x00,0x00,0x80,0xff,0xf8,0xef,
+ 0xff,0x01,0x00,0x00,0x00,0x7f,0xf8,0xef,0xff,0x00,0x00,0x00,0x00,0x3e,0xf8,
+ 0xff,0x7f,0x00,0x00,0x00,0x00,0x1e,0xf8,0xff,0x3f,0x00,0x00,0x00,0x00,0x0f,
+ 0xf8,0xff,0x1f,0x00,0x00,0x00,0x00,0x07,0xf8,0xff,0x3f,0x00,0x00,0x00,0x80,
+ 0x07,0xf8,0xff,0x3f,0x00,0x00,0x00,0x80,0x07,0xf8,0xff,0x7f,0x00,0x00,0x00,
+ 0xc0,0x03,0xf8,0xef,0xff,0x00,0x00,0x00,0xff,0x03,0xf8,0xef,0xff,0xfc,0x00,
+ 0x00,0xff,0x03,0xf8,0xcf,0xff,0xf9,0x00,0x00,0xff,0x03,0xf8,0x8f,0xff,0xf3,
+ 0x00,0x00,0xff,0x03,0xf8,0x0f,0xff,0xf7,0x00,0x80,0xff,0x03,0xf8,0x0f,0xff,
+ 0xe7,0x00,0x80,0xff,0x03,0xf8,0x0f,0xfe,0xcf,0x00,0x00,0xf0,0x03,0xf8,0x0f,
+ 0xfc,0x1f,0x00,0x00,0x80,0x03,0xf8,0x0f,0xfc,0x1f,0x00,0x00,0x80,0x07,0xf8,
+ 0x0f,0xf8,0x3f,0x00,0x00,0x80,0x07,0xf8,0x0f,0xf0,0x7f,0x00,0x00,0x00,0x0f,
+ 0xf8,0x0f,0xf0,0xff,0x00,0x00,0x00,0x0f,0xf8,0x0f,0xe4,0xff,0x00,0x00,0x00,
+ 0x1e,0xf8,0x0f,0xcc,0xff,0x01,0x00,0x00,0x3f,0xf8,0x0f,0x9e,0x1f,0x00,0x00,
+ 0x80,0x7f,0x08,0x80,0x9f,0x03,0x00,0x00,0x80,0xff,0x01,0xc0,0x3f,0x00,0x00,
+ 0x00,0xc0,0xff,0x07,0xf8,0x7f,0x00,0x00,0x00,0xe0,0xff,0xff,0xff,0xff,0x03,
+ 0x00,0x00,0xe0,0xbf,0xff,0xff,0xfe,0x07,0x00,0x00,0xe0,0x0f,0xfc,0x3f,0xf8,
+ 0x03,0x00,0x00,0xc0,0x07,0xf0,0x0f,0xf0,0x01,0x00,0x00,0x80,0x01,0xf0,0x0f,
+ 0xc0,0x00,0x00,0x00,0x00,0x00,0xf0,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,
+ 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xe0,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x07,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0xe0,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00};
diff --git a/kdesktop/pics/ksslogo.png b/kdesktop/pics/ksslogo.png
new file mode 100644
index 000000000..88874ebc3
--- /dev/null
+++ b/kdesktop/pics/ksslogo.png
diff --git a/kdesktop/pics/splash.png b/kdesktop/pics/splash.png
new file mode 100644
index 000000000..00faf07e7
--- /dev/null
+++ b/kdesktop/pics/splash.png
diff --git a/kdesktop/pics/splash2.png b/kdesktop/pics/splash2.png
new file mode 100644
index 000000000..88785147c
--- /dev/null
+++ b/kdesktop/pics/splash2.png