Bugfix batch 2/2

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

22 files changed, 134 insertions, 97 deletions

diff --git a/kdesktop/init/My_Documents b/kdesktop/init/My_Documents
index 5db3e561a..aba639823 100644
--- a/kdesktop/init/My_Documents
+++ b/kdesktop/init/My_Documents
@@ -1,8 +1,16 @@
 [Desktop Entry]
 Encoding=UTF-8
+Comment=
+Comment[en_US]=
+Exec=kfmclient openURL `kde-config --userpath document`
 Icon=folder_wordprocessing
+MimeType=
 Name=My Documents
 Name[en_US]=My Documents
-OnlyShowIn=KDE;
-Type=Link
-URL=$HOME/Documents
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DCOP-ServiceType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
\ No newline at end of file
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index b0dd4f003..a2f23dfaf 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -196,14 +196,14 @@
   </group>
   <group name="Media"> 
     <entry name="MediaEnabled" key="enabled" type="Bool">
-      <default>false</default>
+      <default>true</default>
       <label></label>
       <whatsthis></whatsthis>
       <!-- kdiconview.cc:258 -->
       <!--         m_enableMedia=config->readBoolEntry("enabled",false); -->
     </entry>
     <entry key="exclude" type="String">
-      <default>media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted,media/builtin-mydocuments,media/builtin-mycomputer,media/builtin-mynetworkplaces,media/builtin-printers,media/builtin-trash,media/builtin-webbrowser</default>
+      <default>media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted</default>
       <label>Device Types to exclude</label>
       <whatsthis>The device types which you do not want to see on the desktop.</whatsthis>
       <!-- kdiconview.cc:261 -->
diff --git a/kicker/applets/clock/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg
index 9b1ab3031..fb38d6583 100644
--- a/kicker/applets/clock/clockapplet.kcfg
+++ b/kicker/applets/clock/clockapplet.kcfg
@@ -14,7 +14,7 @@
         <choice name="Analog"/>
         <choice name="Fuzzy"/>
       </choices>
-      <default>Digital</default>
+      <default>Plain</default>
     </entry>
   </group>
   <group name="Date">
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 7aee673f1..52e85bd7e 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -63,7 +63,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "container_extension.h"
 
 /* 1 is the initial speed, hide_show_animation is the top speed. */
-#define PANEL_SPEED(x, c) (int)((1.0-2.0*fabs((x)-(c)/2.0)/c)*m_settings.hideAnimationSpeed()+1.0)
+/* PANEL_SPEED_MULTIPLIER is used to increase the overall speed as the panel seems to have slowed down over the various releases! */
+#define PANEL_SPEED_MULTIPLIER 10.0
+#define PANEL_SPEED(x, c) (int)(((1.0-2.0*fabs((x)-(c)/2.0)/c)*m_settings.hideAnimationSpeed()+1.0)*PANEL_SPEED_MULTIPLIER)
 
 ExtensionContainer::ExtensionContainer(const AppletInfo& info,
                                        const TQString& extensionId,
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 6334cb2d2..779555a3d 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -265,6 +265,19 @@ void ContainerArea::defaultContainerConfig()
         containers.append(a);
     }
 
+    // lock applet
+    a = manager->createAppletContainer(
+        "lockout.desktop",
+        true,
+        TQString::null,
+        m_opMenu,
+        m_contents );
+    if (a)
+    {
+        a->setFreeSpace(1);
+        containers.append(a);
+    }
+
     for (BaseContainer::Iterator it = containers.begin();
          it != containers.end();
          ++it)
diff --git a/kicker/kicker/core/extensionSettings.kcfg b/kicker/kicker/core/extensionSettings.kcfg
index dcf7edd23..432b1fb15 100644
--- a/kicker/kicker/core/extensionSettings.kcfg
+++ b/kicker/kicker/core/extensionSettings.kcfg
@@ -101,7 +101,7 @@
 
 <entry name="Size" type="Int">
       <label>Size</label>
-      <default code="true">KPanelExtension::SizeNormal</default>
+      <default code="true">KPanelExtension::SizeSmall</default>
    </entry>
 
 <entry name="CustomSize" type="Int" >
diff --git a/kicker/kicker/panel.desktop b/kicker/kicker/panel.desktop
index 605610841..ba0cad218 100644
--- a/kicker/kicker/panel.desktop
+++ b/kicker/kicker/panel.desktop
@@ -1,86 +1,86 @@
 [Desktop Entry]
 Exec=kicker
-Name=KDE Panel
-Name[af]=KDE Paneel
-Name[ar]=لوحة KDE
-Name[az]=KDE Paneli
-Name[be]=Панэль KDE
+Name=Trinity Panel
+Name[af]=Trinity Paneel
+Name[ar]=لوحة Trinity
+Name[az]=Trinity Paneli
+Name[be]=Панэль Trinity
 Name[bg]=Системен панел
 Name[bn]=কে.ডি.ই. প্যানেল
-Name[br]=Panell KDE
-Name[bs]=KDE panel
-Name[ca]=Plafó KDE
-Name[cs]=Panel KDE
-Name[cy]=Panel KDE
-Name[de]=KDE-Kontrollleiste
-Name[el]=Πίνακας KDE
+Name[br]=Panell Trinity
+Name[bs]=Trinity panel
+Name[ca]=Plafó Trinity
+Name[cs]=Panel Trinity
+Name[cy]=Panel Trinity
+Name[de]=Trinity-Kontrollleiste
+Name[el]=Πίνακας Trinity
 Name[eo]=Panelo
-Name[es]=Panel de KDE
-Name[et]=KDE paneel
-Name[eu]=KDE panela
-Name[fa]=تابلوی KDE
-Name[fi]=KDE-paneeli
-Name[fr]=Tableau de bord de KDE
-Name[fy]=KDE Paniel
-Name[ga]=Painéal KDE
-Name[gl]=Painel de KDE
-Name[he]=הלוח של KDE
+Name[es]=Panel de Trinity
+Name[et]=Trinity paneel
+Name[eu]=Trinity panela
+Name[fa]=تابلوی Trinity
+Name[fi]=Trinity-paneeli
+Name[fr]=Tableau de bord de Trinity
+Name[fy]=Trinity Paniel
+Name[ga]=Painéal Trinity
+Name[gl]=Painel de Trinity
+Name[he]=הלוח של Trinity
 Name[hi]=केडीई फलक
-Name[hr]=KDE ploča
+Name[hr]=Trinity ploča
 Name[hu]=Panel
-Name[id]=Panel KDE
-Name[is]=KDE spjald
-Name[it]=Pannello di KDE
-Name[ja]=KDE パネル
-Name[ka]=KDE-ს პანელი
-Name[kk]=KDE панелі
-Name[km]=បន្ទះ KDE
-Name[ku]=Panela KDE'yê
-Name[lo]=ຖາດພາເນລຂອง KDE
-Name[lt]=KDE pultas
-Name[lv]=KDE Panelis
-Name[mk]=Панелот на KDE
+Name[id]=Panel Trinity
+Name[is]=Trinity spjald
+Name[it]=Pannello di Trinity
+Name[ja]=Trinity パネル
+Name[ka]=Trinity-ს პანელი
+Name[kk]=Trinity панелі
+Name[km]=បន្ទះ Trinity
+Name[ku]=Panela Trinity'yê
+Name[lo]=ຖາດພາເນລຂອง Trinity
+Name[lt]=Trinity pultas
+Name[lv]=Trinity Panelis
+Name[mk]=Панелот на Trinity
 Name[mn]=КДЭ-Удирдлагын самбар
-Name[ms]=Panel KDE
-Name[mt]=Pannell KDE
-Name[nb]=KDE-Panel
-Name[nds]=KDE-Paneel
-Name[ne]=KDE प्यानल
-Name[nl]=KDE Paneel
-Name[nn]=KDE-panel
-Name[nso]=Panel ya KDE
-Name[pa]=KDE ਪੈਨਲ
+Name[ms]=Panel Trinity
+Name[mt]=Pannell Trinity
+Name[nb]=Trinity-Panel
+Name[nds]=Trinity-Paneel
+Name[ne]=Trinity प्यानल
+Name[nl]=Trinity Paneel
+Name[nn]=Trinity-panel
+Name[nso]=Panel ya Trinity
+Name[pa]=Trinity ਪੈਨਲ
 Name[pl]=Panel
-Name[pt]=Painel do KDE
-Name[pt_BR]=Painel do KDE
-Name[ro]=Panou KDE
-Name[ru]=Панель KDE
-Name[rw]=KDE Umwanya
-Name[se]=KDE-panela
-Name[sk]=KDE panel
-Name[sl]=Pult KDE
-Name[sr]=KDE панел
-Name[sr@Latn]=KDE panel
-Name[sv]=KDE-panel
-Name[ta]=KDE பலகம்
+Name[pt]=Painel do Trinity
+Name[pt_BR]=Painel do Trinity
+Name[ro]=Panou Trinity
+Name[ru]=Панель Trinity
+Name[rw]=Trinity Umwanya
+Name[se]=Trinity-panela
+Name[sk]=Trinity panel
+Name[sl]=Pult Trinity
+Name[sr]=Trinity панел
+Name[sr@Latn]=Trinity panel
+Name[sv]=Trinity-panel
+Name[ta]=Trinity பலகம்
 Name[te]=కెడిఈ పెనల్
-Name[tg]=Сафҳаи KDE
-Name[th]=ถาดพาเนล KDE
-Name[tr]=KDE Paneli
-Name[tt]=KDE Üzäge
-Name[uk]=Панель KDE
-Name[uz]=KDE paneli
-Name[uz@cyrillic]=KDE панели
-Name[ven]=Phanele ya KDE
-Name[vi]=Bảng điều khiển KDE
-Name[wa]=Scriftôr KDE
-Name[xh]=Ipanel ye KDE
-Name[zh_CN]=KDE 面板
-Name[zh_TW]=KDE 面板
-Name[zu]=Iwindi lemininingwane le-KDE
+Name[tg]=Сафҳаи Trinity
+Name[th]=ถาดพาเนล Trinity
+Name[tr]=Trinity Paneli
+Name[tt]=Trinity Üzäge
+Name[uk]=Панель Trinity
+Name[uz]=Trinity paneli
+Name[uz@cyrillic]=Trinity панели
+Name[ven]=Phanele ya Trinity
+Name[vi]=Bảng điều khiển Trinity
+Name[wa]=Scriftôr Trinity
+Name[xh]=Ipanel ye Trinity
+Name[zh_CN]=Trinity 面板
+Name[zh_TW]=Trinity 面板
+Name[zu]=Iwindi lemininingwane le-Trinity
 X-DCOP-ServiceType=wait
-X-KDE-autostart-after=kdesktop
+X-Trinity-autostart-after=kdesktop
 DocPath=kicker/index.html
 Type=Service
-OnlyShowIn=KDE;
-X-KDE-autostart-phase=0
+OnlyShowIn=Trinity;
+X-Trinity-autostart-phase=0
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 50ceceea9..b8084f489 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -520,6 +520,7 @@ void PanelKMenu::showMenu()
     else
     {
         show();
+        repaint();	// If the menu is not repainted on initial display the search bar merges into the side image
     }
 }
 
diff --git a/klipper/toplevel.h b/klipper/toplevel.h
index 7502e4c46..acb41b22a 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.h
@@ -174,8 +174,8 @@ private:
     KAction* quitAction;
     TQPixmap m_pixmap;
     TQPixmap m_scaledpixmap;
-    int m_iconOrigWidth;
-    int m_iconOrigHeight;
+    int m_iconOrigWidth :0;
+    int m_iconOrigHeight :0;
     bool bPopupAtMouse :1;
     bool bKeepContents :1;
     bool bURLGrabber   :1;
diff --git a/ksplashml/main.cpp b/ksplashml/main.cpp
index 2a79723d2..995cf8a2a 100644
--- a/ksplashml/main.cpp
+++ b/ksplashml/main.cpp
@@ -43,7 +43,7 @@ int main( int argc, char **argv )
     "ksplash",
     I18N_NOOP("KSplash"),
     VERSION,
-    I18N_NOOP("KDE splash screen"),
+    I18N_NOOP("Trinity splash screen"),
     KAboutData::License_GPL,
     I18N_NOOP("(c) 2001 - 2003, Flaming Sword Productions\n (c) 2003 KDE developers"),
     "http://www.kde.org");
diff --git a/ksplashml/pics/splash.png b/ksplashml/pics/splash.png
index 6608881c9..0be338743 100644
--- a/ksplashml/pics/splash.png
+++ b/ksplashml/pics/splash.png
diff --git a/ksplashml/pics/themes/blue-bend/splash_top.png b/ksplashml/pics/themes/blue-bend/splash_top.png
index 8cde6855f..bfcd8637b 100644
--- a/ksplashml/pics/themes/blue-bend/splash_top.png
+++ b/ksplashml/pics/themes/blue-bend/splash_top.png
diff --git a/ksplashml/pics/themes/default/Preview.png b/ksplashml/pics/themes/default/Preview.png
index 4b589d71d..468318984 100644
--- a/ksplashml/pics/themes/default/Preview.png
+++ b/ksplashml/pics/themes/default/Preview.png
diff --git a/ksplashml/pics/themes/default/Theme.rc b/ksplashml/pics/themes/default/Theme.rc
index 75cfed06f..fbae7f956 100644
--- a/ksplashml/pics/themes/default/Theme.rc
+++ b/ksplashml/pics/themes/default/Theme.rc
@@ -4,12 +4,12 @@
 Name = KDE 3.5 Splash Screen
 Description = Waves of change
 Version = 1.0
-Author = Lee Olson <[email protected]>
+Author = Lee Olson <[email protected]> and Timothy Pearson <[email protected]>
 
 # Theme behaviour settings.
 Engine = Default
 
-# Should icons blink ala KDE, or not?
+# Should icons blink ala Trinity, or not?
 Icons Flashing = true
 
 # Show progress bar?
diff --git a/ksplashml/pics/themes/default/locolor/Theme.rc b/ksplashml/pics/themes/default/locolor/Theme.rc
index 75cfed06f..fbae7f956 100644
--- a/ksplashml/pics/themes/default/locolor/Theme.rc
+++ b/ksplashml/pics/themes/default/locolor/Theme.rc
@@ -4,12 +4,12 @@
 Name = KDE 3.5 Splash Screen
 Description = Waves of change
 Version = 1.0
-Author = Lee Olson <[email protected]>
+Author = Lee Olson <[email protected]> and Timothy Pearson <[email protected]>
 
 # Theme behaviour settings.
 Engine = Default
 
-# Should icons blink ala KDE, or not?
+# Should icons blink ala Trinity, or not?
 Icons Flashing = true
 
 # Show progress bar?
diff --git a/ksplashml/pics/themes/default/locolor/splash_top.png b/ksplashml/pics/themes/default/locolor/splash_top.png
index 6e09167a3..52d5d32b7 100644
--- a/ksplashml/pics/themes/default/locolor/splash_top.png
+++ b/ksplashml/pics/themes/default/locolor/splash_top.png
diff --git a/ksplashml/pics/themes/default/splash_top.png b/ksplashml/pics/themes/default/splash_top.png
index 0db66470b..e0336c5aa 100644
--- a/ksplashml/pics/themes/default/splash_top.png
+++ b/ksplashml/pics/themes/default/splash_top.png
diff --git a/ksplashml/themeengine/default/themelegacy.h b/ksplashml/themeengine/default/themelegacy.h
index 95ad6634e..852425414 100644
--- a/ksplashml/themeengine/default/themelegacy.h
+++ b/ksplashml/themeengine/default/themelegacy.h
@@ -35,7 +35,7 @@ protected:
 };
 
 /**
- * @short Traditional KDE splash screen.
+ * @short Traditional Trinity splash screen.
  */
 class ObjKsTheme;
 class KDE_EXPORT ThemeDefault : public ThemeEngine
diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp
index 8ed1cad2f..9aa6d2b26 100644
--- a/ksplashml/themeengine/objkstheme.cpp
+++ b/ksplashml/themeengine/objkstheme.cpp
@@ -132,7 +132,7 @@ bool ObjKsTheme::loadKConfig( KConfig *cfg, const TQString& activeTheme, bool fo
   m_text.append( cfg->readEntry( "Message5", i18n("Loading the desktop") ) );
   m_text.append( cfg->readEntry( "Message6", i18n("Loading the panel") ) );
   m_text.append( cfg->readEntry( "Message7", i18n("Restoring session") ) );
-  m_text.append( cfg->readEntry( "Message8", i18n("KDE is up and running") ) );
+  m_text.append( cfg->readEntry( "Message8", i18n("Trinity is up and running") ) );
 
   return true;
 }
diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp
index 6946ab54f..3817a8c4c 100644
--- a/kxkb/extension.cpp
+++ b/kxkb/extension.cpp
@@ -180,13 +180,17 @@ bool XKBExtension::setLayoutInternal(const TQString& model,
     p.start(KProcess::Block); 
 
     // reload system-wide hotkey-setup keycode -> keysym maps
-    KProcess pXmodmap;
-    pXmodmap << "xmodmap" << "/opt/trinity/share/apps/kxkb/system.xmodmap &> /dev/null";
-    pXmodmap.start(KProcess::Block); 
+    if ( TQFile::exists( "/opt/trinity/share/apps/kxkb/system.xmodmap" ) ) {
+        KProcess pXmodmap;
+        pXmodmap << "xmodmap" << "/opt/trinity/share/apps/kxkb/system.xmodmap";
+        pXmodmap.start(KProcess::Block);
+    }
 
-    KProcess pXmodmapHome;
-    pXmodmapHome << "xmodmap" << TQDir::home().path() + "/.Xmodmap &> /dev/null";
-    pXmodmapHome.start(KProcess::Block);
+    if ( TQFile::exists( TQDir::home().path() + "/.Xmodmap" ) ) {
+        KProcess pXmodmapHome;
+        pXmodmapHome << "xmodmap" << TQDir::home().path() + "/.Xmodmap";
+        pXmodmapHome.start(KProcess::Block);
+    }
 
     return p.normalExit() && (p.exitStatus() == 0);
 }
diff --git a/pics/wallpapers/KDE34.png b/pics/wallpapers/KDE34.png
index e37cf0b6f..7c5f4ddf3 100644
--- a/pics/wallpapers/KDE34.png
+++ b/pics/wallpapers/KDE34.png
diff --git a/startkde b/startkde
index 0fa4eb327..c6be49c18 100644
--- a/startkde
+++ b/startkde
@@ -83,7 +83,10 @@ else
   elif [ -f /usr/bin/kde4-config ]; then
     # Looks like KDE4 is installed.
     if [ -d $HOME/.kde ] && [ ! -d $HOME/.kde3 ]; then
-      # Presume $HOME/.kde is being used for KDE4
+      # Presume $HOME/.kde is being used for KDE4 as it already exists.
+      export KDEHOME=$HOME/.kde3
+    else
+      # Presume $HOME/.kde is being used for KDE4 to be on the safe side.
       export KDEHOME=$HOME/.kde3
     fi
   elif [ -f /opt/kde3/bin/kde-config ]; then
@@ -102,6 +105,12 @@ else
   echo "[startkde] Set KDEHOME to $KDEHOME." 1>&2
 fi
 
+# Run a quick test for root.
+if [ -z "$KDEROOTHOME" ] && [ "$UID" = "0" ]; then
+  echo "startkde: User ID is $UID. Setting KDEROOTHOME to $KDEHOME."
+  export KDEROOTHOME=$KDEHOME
+fi
+
 # Modify the following environment variables only as necessary.
 if [ -d /opt/kde3/games ]; then
   export PATH=/opt/kde3/games:$PATH