kdelibs update to Trinity v3.5.11

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

10 files changed, 57 insertions, 53 deletions

diff --git a/kdeui/Makefile.am b/kdeui/Makefile.am
index 6524105b1..70157796a 100644
--- a/kdeui/Makefile.am
+++ b/kdeui/Makefile.am
@@ -18,7 +18,8 @@
 #    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 #    Boston, MA 02110-1301, USA.
 
-SUBDIRS = . kdetrayproxy tests about
+SUBDIRS = . tests about
+DIST_SUBDIRS = kdetrayproxy
 
 INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/interfaces $(all_includes)
 
@@ -28,10 +29,9 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
 
 lib_LTLIBRARIES = libkdeui.la libkspell.la
 libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
-libkdeui_la_LIBADD = ../kdecore/libkdecore.la
+libkdeui_la_LIBADD = ../kdecore/libkdecore.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kdefx/libkdefx.la $(LIB_XEXT)
 
 libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
-libkspell_la_LIBADD = libkdeui.la
 libkspell_la_SOURCES = dummy.cpp
 
 picsdir = $(kde_datadir)/kdeui/pics
diff --git a/kdeui/kaboutapplication.cpp b/kdeui/kaboutapplication.cpp
index 594e2a1f5..dff83b19f 100644
--- a/kdeui/kaboutapplication.cpp
+++ b/kdeui/kaboutapplication.cpp
@@ -113,8 +113,8 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData )
       KActiveLabel* activeLabel = new KActiveLabel( authorPage );
       if (!aboutData->customAuthorTextEnabled())
       {
-        if ( aboutData->bugAddress().isEmpty() || aboutData->bugAddress() == "submit@bugs.kde.org")
-          text = i18n( "Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> to report bugs.\n" );
+        if ( aboutData->bugAddress().isEmpty() || aboutData->bugAddress() == "submit@bugs.pearsoncomputing.net")
+          text = i18n( "Please use <a href=\"http://bugs.pearsoncomputing.net\">http://bugs.pearsoncomputing.net</a> to report bugs.\n" );
         else {
           if( aboutData->authors().count() == 1 && ( aboutData->authors().first().emailAddress() == aboutData->bugAddress() ) )
           {
diff --git a/kdeui/kaboutkde.cpp b/kdeui/kaboutkde.cpp
index f6fe8cde9..ba4e84fad 100644
--- a/kdeui/kaboutkde.cpp
+++ b/kdeui/kaboutkde.cpp
@@ -32,20 +32,22 @@ KAboutKDE::KAboutKDE( QWidget *parent, const char *name, bool modal )
 		 parent, name, modal )
 {
   const QString text1 = i18n(""
-    "The <b>K Desktop Environment</b> is written and maintained by the "
-    "KDE Team, a world-wide network of software engineers committed to "
-    "<a href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> development.<br><br>"
-    "No single group, company or organization controls the KDE source "
-    "code. Everyone is welcome to contribute to KDE.<br><br>"
-    "Visit <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> for "
-    "more information on the KDE project. ");
+    "The <b>Trinity Desktop Environment</b> is a fork of the "
+    "K Desktop Environment version 3.5, which was originally written by the KDE Team, "
+    "a world-wide network of software engineers committed to <a "
+    "href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
+    "development.<br><br>No single group, company or organization controls the "
+    "Trinity source code. Everyone is welcome to contribute to Trinity.<br><br>Visit <A "
+    "HREF=\"http://trinity.pearsoncomputing.net/\">http://trinity.pearsoncomputing.net</A> for more information "
+    "about Trinity, and <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
+    "for more information on the KDE project. ");
 
   const QString text2 = i18n(""
-    "Software can always be improved, and the KDE Team is ready to "
+    "Software can always be improved, and the Trinity Team is ready to "
     "do so. However, you - the user - must tell us when "
     "something does not work as expected or could be done better.<br><br>"
-    "The K Desktop Environment has a bug tracking system. Visit "
-    "<A HREF=\"http://bugs.kde.org/\">http://bugs.kde.org</A> or "
+    "The Trinity Desktop Environment has a bug tracking system. Visit "
+    "<A HREF=\"http://bugs.pearsoncomputing.net/\">http://bugs.pearsoncomputing.net</A> or "
     "use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.<br><br>"
     "If you have a suggestion for improvement then you are welcome to use "
     "the bug tracking system to register your wish. Make sure you use the "
@@ -53,37 +55,33 @@ KAboutKDE::KAboutKDE( QWidget *parent, const char *name, bool modal )
 
   const QString text3 = i18n(""
     "You do not have to be a software developer to be a member of the "
-    "KDE team. You can join the national teams that translate "
+    "Trinity team. You can join the national teams that translate "
     "program interfaces. You can provide graphics, themes, sounds, and "
     "improved documentation. You decide!"
     "<br><br>"
     "Visit "
-    "<A HREF=\"http://www.kde.org/jobs/\">http://www.kde.org/jobs/</A> "
+    "<A HREF=\"http://trinity.pearsoncomputing.net/jobs/\">http://trinity.pearsoncomputing.net/jobs/</A> "
     "for information on some projects in which you can participate."
     "<br><br>"
     "If you need more information or documentation, then a visit to "
-    "<A HREF=\"http://developer.kde.org/\">http://developer.kde.org</A> "
+    "<A HREF=\"http://trinity.pearsoncomputing.net/docs/\">http://trinity.pearsoncomputing.net/docs/</A> "
     "will provide you with what you need.");
   const QString text4 = i18n(""
-    "KDE is available free of charge, but making it is not free.<br><br>"
-    "Thus, the KDE team formed the KDE e.V., a non-profit organization"
-    " legally founded in Tuebingen, Germany. The KDE e.V. represents"
-    " the KDE project in legal and financial matters."
-    " See <a href=\"http://www.kde-ev.org/\">http://www.kde-ev.org</a>"
-    " for information on the KDE e.V.<br><br>"
-    "The KDE team does need financial support. Most of the money is used to "
+    "Trinity is available free of charge, but making it is not free.<br><br>"
+    "<br><br>"
+    "The Trinity team does need financial support. Most of the money is used to "
     "reimburse members and others on expenses they experienced when "
-    "contributing to KDE. You are encouraged to support KDE through a financial "
+    "contributing to Trinity. You are encouraged to support Trinity through a financial "
     "donation, using one of the ways described at "
-    "<a href=\"http://www.kde.org/support/\">http://www.kde.org/support/</a>."
-    "<br><br>Thank you very much in advance for your support.");
+    "<a href=\"http://trinity.pearsoncomputing.net/support/\">http://trinity.pearsoncomputing.net/support/</a>."
+    "<br><br>Thank you very much in advance for your support!");
   setHelp( QString::fromLatin1("khelpcenter/main.html"), QString::null );
-  setTitle(i18n("K Desktop Environment. Release %1").
+  setTitle(i18n("Trinity Desktop Environment. Release %1").
 	   arg(QString::fromLatin1(KDE_VERSION_STRING)) );
-  addTextPage( i18n("About KDE","&About"), text1, true );
+  addTextPage( i18n("About Trinity","&About"), text1, true );
   addTextPage( i18n("&Report Bugs or Wishes"), text2, true );
-  addTextPage( i18n("&Join the KDE Team"), text3, true );
-  addTextPage( i18n("&Support KDE"), text4, true );
+  addTextPage( i18n("&Join the Trinity Team"), text3, true );
+  addTextPage( i18n("&Support Trinity"), text4, true );
   setImage( locate( "data", QString::fromLatin1("kdeui/pics/aboutkde.png")) );
   setImageBackgroundColor( white );
 }
diff --git a/kdeui/kbugreport.cpp b/kdeui/kbugreport.cpp
index f6f529197..ad261eebd 100644
--- a/kdeui/kbugreport.cpp
+++ b/kdeui/kbugreport.cpp
@@ -88,12 +88,13 @@ KBugReport::KBugReport( QWidget * parentw, bool modal, const KAboutData *aboutDa
   QWidget * parent = plainPage();
   d->submitBugButton = 0;
 
-  if ( m_aboutData->bugAddress() == QString::fromLatin1("submit@bugs.kde.org") )
-  {
-    // This is a core KDE application -> redirect to the web form
+  //if ( m_aboutData->bugAddress() == QString::fromLatin1("submit@bugs.pearsoncomputing.net") )
+  //{
+  //  // This is a core KDE application -> redirect to the web form
+    // Always redirect to the Web form for Trinity
     d->submitBugButton = new QPushButton( parent );
     setButtonCancel( KStdGuiItem::close() );
-  }
+  //}
 
   QLabel * tmpLabel;
   QVBoxLayout * lay = new QVBoxLayout( parent, 0, spacingHint() );
@@ -250,7 +251,7 @@ KBugReport::KBugReport( QWidget * parentw, bool modal, const KAboutData *aboutDa
 
     lay->addSpacing(10);
     QString text = i18n("To submit a bug report, click on the button below.\n"
-                        "This will open a web browser window on http://bugs.kde.org where you will find a form to fill in.\n"
+                        "This will open a web browser window on http://bugs.pearsoncomputing.net where you will find a form to fill in.\n"
                         "The information displayed above will be transferred to that server.");
     QLabel * label = new QLabel( text, parent, "label");
     lay->addWidget( label );
@@ -274,13 +275,14 @@ KBugReport::~KBugReport()
 
 void KBugReport::updateURL()
 {
-    KURL url ( "http://bugs.kde.org/wizard.cgi" );
-    url.addQueryItem( "os", d->os );
-    url.addQueryItem( "compiler", KDE_COMPILER_VERSION );
-    url.addQueryItem( "kdeVersion", d->kde_version );
-    url.addQueryItem( "appVersion", m_strVersion );
-    url.addQueryItem( "package", d->appcombo->currentText() );
-    url.addQueryItem( "kbugreport", "1" );
+    KURL url ( "http://bugs.pearsoncomputing.net/enter_bug.cgi" );
+    url.addQueryItem( "product", "KDE 3.5" );
+    url.addQueryItem( "op_sys", d->os );
+    url.addQueryItem( "cf_kde_compiler", KDE_COMPILER_VERSION );
+    url.addQueryItem( "cf_kde_version", d->kde_version );
+    url.addQueryItem( "cf_kde_appversion", m_strVersion );
+    url.addQueryItem( "cf_kde_package", d->appcombo->currentText() );
+    url.addQueryItem( "cf_kde_kbugreport", "1" );
     d->url = url;
 }
 
@@ -408,7 +410,7 @@ void KBugReport::slotOk( void )
     {
         QString msg = i18n("Unable to send the bug report.\n"
                            "Please submit a bug report manually...\n"
-                           "See http://bugs.kde.org/ for instructions.");
+                           "See http://bugs.pearsoncomputing.net/ for instructions.");
         KMessageBox::error(this, msg + "\n\n" + d->lastError);
         return;
     }
@@ -476,7 +478,7 @@ bool KBugReport::sendBugReport()
 {
   QString recipient ( m_aboutData ?
     m_aboutData->bugAddress() :
-    QString::fromLatin1("submit@bugs.kde.org") );
+    QString::fromLatin1("submit@bugs.pearsoncomputing.net") );
 
   QString command;
   command = locate("exe", "ksendbugmail");
diff --git a/kdeui/kbugreport.h b/kdeui/kbugreport.h
index b5f541603..3220903e0 100644
--- a/kdeui/kbugreport.h
+++ b/kdeui/kbugreport.h
@@ -66,7 +66,7 @@ protected slots:
    */
   virtual void slotSetFrom();
   /**
-   * The URL-Label "http://bugs.kde.org/" was clicked.
+   * The URL-Label "http://bugs.pearsoncomputing.net/" was clicked.
    * @deprecated remove in KDE4.0
    */
   virtual void slotUrlClicked(const QString &);
diff --git a/kdeui/kdetrayproxy/Makefile.am b/kdeui/kdetrayproxy/Makefile.am
index 49d823d31..a1e803af0 100644
--- a/kdeui/kdetrayproxy/Makefile.am
+++ b/kdeui/kdetrayproxy/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kded_kdetrayproxy.la
 INCLUDES= -I$(top_srcdir)/kded $(all_includes)
 kded_kdetrayproxy_la_SOURCES = kdetrayproxy.cpp module.cpp module.skel
 kded_kdetrayproxy_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kdetrayproxy_la_LIBADD = $(LIB_KDECORE) $(LIB_KDED)
+kded_kdetrayproxy_la_LIBADD = $(LIB_KDECORE) $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) $(top_builddir)/kded/libkdeinit_kded.la
 
 METASOURCES = AUTO
 
diff --git a/kdeui/khelpmenu.cpp b/kdeui/khelpmenu.cpp
index d5e8eca58..15ee9f58e 100644
--- a/kdeui/khelpmenu.cpp
+++ b/kdeui/khelpmenu.cpp
@@ -173,7 +173,7 @@ KPopupMenu* KHelpMenu::menu()
     
     if (kapp->authorizeKAction("help_about_kde"))
     {
-      mMenu->insertItem( SmallIcon("about_kde"), i18n( "About &KDE" ), menuAboutKDE );
+      mMenu->insertItem( SmallIcon("about_kde"), i18n( "About &Trinity" ), menuAboutKDE );
       mMenu->connectItem( menuAboutKDE, this, SLOT( aboutKDE() ) );
     }
   }
diff --git a/kdeui/kiconview.cpp b/kdeui/kiconview.cpp
index 4d220c331..77756030b 100644
--- a/kdeui/kiconview.cpp
+++ b/kdeui/kiconview.cpp
@@ -548,7 +548,7 @@ void KIconViewItem::calcRect( const QString& text_ )
     r = m_wordWrap->boundingRect();
 
     int realWidth = QMAX( QMIN( r.width() + 4, tw ), fm->width( "X" ) );
-    itemTextRect.setWidth( realWidth );
+    itemTextRect.setWidth( realWidth + 2);
     itemTextRect.setHeight( r.height() );
 
     int w = 0;    int h = 0;    int y = 0;
@@ -699,11 +699,13 @@ void KIconViewItem::paintPixmap( QPainter *p, const QColorGroup &cg )
 
 void KIconViewItem::paintText( QPainter *p, const QColorGroup &cg )
 {
-    int textX = textRect( false ).x() + 2;
+    int textX = textRect( false ).x() + 4;
     int textY = textRect( false ).y();
 
     if ( isSelected() ) {
-        p->fillRect( textRect( false ), cg.highlight() );
+	p->setBrush(QBrush(cg.highlight()));
+	p->setPen(QPen(cg.highlight()));
+	p->drawRoundRect( textRect( false ) ,1000/textRect(false).width(),1000/textRect(false).height() );		
         p->setPen( QPen( cg.highlightedText() ) );
     } else {
         if ( iconView()->itemTextBackground() != NoBrush )
diff --git a/kdeui/kstdaction_p.h b/kdeui/kstdaction_p.h
index e41002508..f8f91868d 100644
--- a/kdeui/kstdaction_p.h
+++ b/kdeui/kstdaction_p.h
@@ -111,7 +111,7 @@ static const KStdActionInfo g_rgActionInfo[] =
 	{ ReportBug,     KStdAccel::AccelNone, "help_report_bug", I18N_NOOP("&Report Bug..."), 0, 0 },
 	{ SwitchApplicationLanguage,     KStdAccel::AccelNone, "switch_application_language", I18N_NOOP("Switch application &language..."), 0, 0 },
 	{ AboutApp,      KStdAccel::AccelNone, "help_about_app", I18N_NOOP("&About %1"), 0, 0 },
-	{ AboutKDE,      KStdAccel::AccelNone, "help_about_kde", I18N_NOOP("About &KDE"), 0,"about_kde" },
+	{ AboutKDE,      KStdAccel::AccelNone, "help_about_kde", I18N_NOOP("About &Trinity"), 0,"about_kde" },
 	{ ActionNone, KStdAccel::AccelNone, 0, 0, 0, 0 }
 };
 
diff --git a/kdeui/ktabwidget.cpp b/kdeui/ktabwidget.cpp
index 42e00c96a..a012ea96e 100644
--- a/kdeui/ktabwidget.cpp
+++ b/kdeui/ktabwidget.cpp
@@ -56,6 +56,8 @@ KTabWidget::KTabWidget( QWidget *parent, const char *name, WFlags f )
     setTabBar( new KTabBar(this, "tabbar") );
     setAcceptDrops( true );
 
+    setHoverCloseButtonDelayed(false);
+
     connect(tabBar(), SIGNAL(contextMenu( int, const QPoint & )), SLOT(contextMenu( int, const QPoint & )));
     connect(tabBar(), SIGNAL(mouseDoubleClick( int )), SLOT(mouseDoubleClick( int )));
     connect(tabBar(), SIGNAL(mouseMiddleClick( int )), SLOT(mouseMiddleClick( int )));