#i106113# update from shtylman and kendy (thanks !)

2 files changed, 21 insertions, 15 deletions

diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 796350a63d50..1984cd979117 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -181,7 +181,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     StyleSettings style( rSettings.GetStyleSettings() );
     BOOL bSetTitleFont = false;
 
-
     // General settings
     QPalette pal = kapp->palette();
 
@@ -214,6 +213,14 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
         pKey = "Theme";
         if ( aGroup.hasKey( pKey ) )
             style.SetPreferredSymbolsStyleName( readEntryUntranslated( &aGroup, pKey ) );
+
+        //toolbar
+        pKey = "toolbarFont";
+        if ( aGroup.hasKey( pKey ) )
+        {
+            Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILocale() );
+            style.SetToolFont( aFont );
+        }
     }
 
     Color aFore = toColor( pal.color( QPalette::Active, QPalette::WindowText ) );
@@ -288,7 +295,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
 
     style.SetFloatTitleFont( aFont );
     style.SetMenuFont( aFont ); // will be changed according to pMenuBar
-    style.SetToolFont( aFont ); // will be changed according to pToolBar
+    //style.SetToolFont( aFont ); //already set above
     style.SetLabelFont( aFont );
     style.SetInfoFont( aFont );
     style.SetRadioCheckFont( aFont );
@@ -300,11 +307,9 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     int flash_time = QApplication::cursorFlashTime();
     style.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );
 
-    KMainWindow qMainWindow;
-
     // Menu
     style.SetSkipDisabledInMenus( TRUE );
-    KMenuBar *pMenuBar = qMainWindow.menuBar();
+    KMenuBar* pMenuBar = new KMenuBar();
     if ( pMenuBar )
     {
         // Color
@@ -337,13 +342,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
         style.SetMenuFont( aFont );
     }
 
-    // Tool bar
-    KToolBar *pToolBar = qMainWindow.toolBar();
-    if ( pToolBar )
-    {
-        aFont = toFont( pToolBar->font(), rSettings.GetUILocale() );
-        style.SetToolFont( aFont );
-    }
+    delete pMenuBar;
 
     // Scroll bar size
     style.SetScrollBarSize( kapp->style()->pixelMetric( QStyle::PM_ScrollBarExtent ) );
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 70b1796df7f0..dedda64d157e 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -77,24 +77,30 @@ void KDEXLib::Init()
     pInputMethod->SetLocale();
     XrmInitialize();
 
-    KAboutData *kAboutData = new KAboutData( "OpenOffice.org",
-            "OpenOffice.org",
+    KAboutData *kAboutData = new KAboutData("OpenOffice.org",
+            "kdelibs4",
             ki18n( "OpenOffice.org" ),
             "3.0.0",
             ki18n( "OpenOffice.org with KDE Native Widget Support." ),
             KAboutData::License_LGPL,
-            ki18n( "Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008 Novell, Inc"),
+            ki18n( "Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Novell, Inc"),
             ki18n( "OpenOffice.org is an office suite.\n" ),
             "http://kde.openoffice.org/index.html",
             "dev@kde.openoffice.org" );
+
     kAboutData->addAuthor( ki18n( "Jan Holesovsky" ),
             ki18n( "Original author and maintainer of the KDE NWF." ),
             "kendy@artax.karlin.mff.cuni.cz",
             "http://artax.karlin.mff.cuni.cz/~kendy" );
+    kAboutData->addAuthor( ki18n("Roman Shtylman"),
+            ki18n( "Porting to KDE 4." ),
+            "shtylman@gmail.com", "http://shtylman.com" );
     kAboutData->addAuthor( ki18n("Eric Bischoff"),
             ki18n( "Accessibility fixes, porting to KDE 4." ),
             "bischoff@kde.org" );
 
+    //kAboutData->setProgramIconName("OpenOffice");
+
     m_nFakeCmdLineArgs = 1;
     USHORT nIdx;
     vos::OExtCommandLine aCommandLine;
@@ -135,6 +141,7 @@ void KDEXLib::Init()
 
     m_pApplication = new VCLKDEApplication();
     kapp->disableSessionManagement();
+    KApplication::setQuitOnLastWindowClosed(false);
 
     Display* pDisp = QX11Info::display();
     SalKDEDisplay *pSalDisplay = new SalKDEDisplay(pDisp);