8 files changed, 50 insertions, 14 deletions
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 898d2b80b..41d5af10b 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -244,7 +244,7 @@ void SystemTrayApplet::preferences()
 
     TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 2, Qt::Vertical);
 
-    m_showClockSettingCB = new TQCheckBox("Show Clock in Tray", settingsGrid);
+    m_showClockSettingCB = new TQCheckBox(i18n("Show Clock in Tray"), settingsGrid);
     m_showClockSettingCB->setChecked(m_showClockInTray);
 
     //m_iconSelector = new TDEActionSelector(m_settingsDialog);
diff --git a/kicker/data/kmenu_side/kside.png b/kicker/data/kmenu_side/kside.png
index 715981db7..8ae29c175 100644
--- a/kicker/data/kmenu_side/kside.png
+++ b/kicker/data/kmenu_side/kside.png
diff --git a/kicker/data/kmenu_side/kside_tile.png b/kicker/data/kmenu_side/kside_tile.png
index e552e47cc..d206d33d5 100644
--- a/kicker/data/kmenu_side/kside_tile.png
+++ b/kicker/data/kmenu_side/kside_tile.png
diff --git a/kicker/kicker/ui/default-favs b/kicker/kicker/ui/default-favs
index 47522fc4b..64cffc6ac 100644
--- a/kicker/kicker/ui/default-favs
+++ b/kicker/kicker/ui/default-favs
@@ -1,9 +1,9 @@
-MozillaFirefox.desktop
+tde-konqbrowser.desktop
+tde-Home.desktop
 tde-Kontact.desktop
-writer.desktop
+tde-kate.desktop
 tde-amarok.desktop
 tde-digikam.desktop
-tde-Home.desktop
+tde-konsole.desktop
 tde-KControl.desktop
 tde-Help.desktop
-tde-konsole.desktop
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 1aa68a9aa..500bc5485 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -1436,6 +1436,42 @@ void KMenu::insertStaticItems()
            m_systemView->insertItem( "folder_man", i18n( "My Documents" ), documentPath, documentPath, nId++, index++ );
     }
 
+    if ( TDEStandardDirs::exists( TDEGlobalSettings::picturesPath() + "/" ) )
+    {
+        TQString picturesPath = TDEGlobalSettings::picturesPath();
+        if ( picturesPath.endsWith( "/" ) )
+            picturesPath = picturesPath.left( picturesPath.length() - 1 );
+        if (picturesPath!=TQDir::homeDirPath())
+           m_systemView->insertItem( "folder_image", i18n( "My Images" ), picturesPath, picturesPath, nId++, index++ );
+   }
+
+    if ( TDEStandardDirs::exists( TDEGlobalSettings::musicPath() + "/" ) )
+    {
+        TQString musicPath = TDEGlobalSettings::musicPath();
+        if ( musicPath.endsWith( "/" ) )
+            musicPath = musicPath.left( musicPath.length() - 1 );
+        if (musicPath!=TQDir::homeDirPath())
+           m_systemView->insertItem( "folder_sound", i18n( "My Music" ), musicPath, musicPath, nId++, index++ );
+    }
+
+    if ( TDEStandardDirs::exists( TDEGlobalSettings::videosPath() + "/" ) )
+    {
+        TQString videosPath = TDEGlobalSettings::videosPath();
+        if ( videosPath.endsWith( "/" ) )
+            videosPath = videosPath.left( videosPath.length() - 1 );
+        if (videosPath!=TQDir::homeDirPath())
+           m_systemView->insertItem( "folder_video", i18n( "My Videos" ), videosPath, videosPath, nId++, index++ );
+    }
+
+    if ( TDEStandardDirs::exists( TDEGlobalSettings::downloadPath() + "/" ) )
+    {
+        TQString downloadPath = TDEGlobalSettings::downloadPath();
+        if ( downloadPath.endsWith( "/" ) )
+            downloadPath = downloadPath.left( downloadPath.length() - 1 );
+        if (downloadPath!=TQDir::homeDirPath())
+           m_systemView->insertItem( "folder_inbox", i18n( "My Downloads" ), downloadPath, downloadPath, nId++, index++ );
+    }
+
     m_systemView->insertItem( "network", i18n( "Network Folders" ),
                               "remote:/", "remote:/", nId++, index++ );
 
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index d41ca66aa..534387394 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -245,7 +245,7 @@ void PrefMenu::initialize()
     if (m_root.isEmpty())
     {
         insertItem(KickerLib::menuIconSet("kcontrol"),
-                   i18n("Control Center"),
+                   i18n("Trinity Control Center"),
                    this, TQT_SLOT(launchControlCenter()));
         insertSeparator();
     }
diff --git a/kicker/menuext/prefmenu/prefmenu.desktop b/kicker/menuext/prefmenu/prefmenu.desktop
index bc285742a..88b0438f6 100644
--- a/kicker/menuext/prefmenu/prefmenu.desktop
+++ b/kicker/menuext/prefmenu/prefmenu.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Control Center
+Name=Trinity Control Center
 Name[af]=Beheer Sentrum
 Name[ar]=مركز التحكم
 Name[az]=İdarə Mərkəzi
@@ -13,7 +13,7 @@ Name[cs]=Ovládací centrum
 Name[csb]=Centróm kòntrolë
 Name[cy]=Canolfan Rheoli
 Name[da]=Kontrolcenter
-Name[de]=Kontrollzentrum
+Name[de]=Trinity-Kontrollzentrum
 Name[el]=Κέντρο ελέγχου
 Name[en_GB]=Control Centre
 Name[eo]=Stircentro
@@ -22,7 +22,7 @@ Name[et]=Juhtimiskeskus
 Name[eu]=Kontrol gunea
 Name[fa]=مرکز کنترل
 Name[fi]=Ohjauskeskus
-Name[fr]=Centre de configuration de TDE
+Name[fr]=Centre de configuration de Trinity
 Name[fy]=Konfiguraasjesintrum
 Name[ga]=Lárionad Rialaithe
 Name[gl]=Centro de Control
@@ -32,7 +32,7 @@ Name[hr]=Upravljačko središte
 Name[hu]=Vezérlőpult
 Name[id]=Pusat Kontrol
 Name[is]=Stjórnborð
-Name[it]=Centro di controllo
+Name[it]=Centro di controllo di Trinity
 Name[ja]=コントロールセンター
 Name[ka]=საკონტროლო ცენტრი
 Name[kk]=Басқару орталығы
@@ -82,7 +82,7 @@ Name[xh]=Umbindi Wolawulo
 Name[zh_CN]=控制中心
 Name[zh_TW]=控制中心
 Name[zu]=Indawo Yokulawula
-Comment=Control Center modules menu
+Comment=Trinity Control Center modules menu
 Comment[af]=Beheer Sentrum Modules kieslys
 Comment[ar]=قائمة وحدات مركز التحكّم
 Comment[be]=Меню модуляў Цэнтра кіравання
@@ -101,14 +101,14 @@ Comment[et]=Juhtimiskeskuse moodulite menüü
 Comment[eu]=Kontrol gunearen moduluen menua
 Comment[fa]=گزینگان پیمانه‌های مرکز کنترل
 Comment[fi]=Ohjauskeskuksen moduulivalikko
-Comment[fr]=Menu des modules du Centre de configuration
+Comment[fr]=Menu des modules du Centre de configuration de Trinity
 Comment[fy]=Menu mei Konfiguraasjemodules
 Comment[gl]=Menu dos Módulos do Centro de Control
 Comment[he]=תפריט מודולי מרכז בקרה
 Comment[hr]=Izbornik modula upravljačkog središta
 Comment[hu]=Menü a Vezérlőpult moduljaival
 Comment[is]=Valmynd stjórnborðseininga
-Comment[it]=Menu dei moduli del centro di controllo
+Comment[it]=Menu dei moduli del centro di controllo di Trinity
 Comment[ja]=コントロールセンターモジュールメニュー
 Comment[kk]=Басқару орталықтың модульдер мәзірі
 Comment[km]=ម៉ឺនុយម៉ូឌុលមជ្ឈមណ្ឌលបញ្ជា
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 860c231bb..326c83cf1 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -1457,7 +1457,7 @@ void TaskContainer::dragEnterEvent( TQDragEnterEvent* e )
         return;
     }
 
-    if ((e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASBKAR_SETTING(sortByApp)))
+    if (e->source() && (e->source()->parent() == this->parent()) && TaskDrag::canDecode(e) && READ_MERGED_TASBKAR_SETTING(allowDragAndDropReArrange) && (!READ_MERGED_TASBKAR_SETTING(sortByApp)))
     {
         e->accept();
     }