ooo-build r14361 - in trunk: . patches/dev300

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Mon Oct 20 18:16:20 2008
New Revision: 14361
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14361&view=rev

Log:
2008-10-20  Jan Holesovsky  <kendy suse cz>

        * patches/dev300/vcl-bigger-icons-kde-gnome.diff: Bigger application
          icons in KDE and Gnome.
        * patches/dev300/kde4-plugin-detection.diff: Most trivial KDE4 plugin
          detection.
        * patches/dev300/apply: Apply the above.


Added:
   trunk/patches/dev300/kde4-plugin-detection.diff
   trunk/patches/dev300/vcl-bigger-icons-kde-gnome.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Oct 20 18:16:20 2008
@@ -1335,6 +1335,10 @@
 native-theme-tab-colors-svtools.diff, n#396386, i#94452, kohei
 native-theme-tab-colors-vcl.diff, n#396386, i#94452, kohei
 
+# There's no reason to arbitrary use smaller icons - it looks ugly in the
+# modern desktop environments
+vcl-bigger-icons-kde-gnome.diff, i#95220, jholesov
+
 [ SystemBits ]
 # use getopt() and readdir_r() from system glibc
 #FIXME src680: system-libc.diff, i#69033, rengelha
@@ -2590,6 +2594,8 @@
 kde4-kde_headers.diff
 kde4-salnativewidgets-kde.diff
 
+kde4-plugin-detection.diff
+
 # More KDE4 bits by Bernhard Rosenkraenzer
 kde4-fpicker.diff, i#90618, brosenk
 
@@ -2765,4 +2771,4 @@
 # and in the Start Menu on Windows
 win32-tooltips.diff, tml
 
-psprint.defconfig_changes.diff, #n436441, flr
\ No newline at end of file
+psprint.defconfig_changes.diff, #n436441, flr

Added: trunk/patches/dev300/kde4-plugin-detection.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/kde4-plugin-detection.diff	Mon Oct 20 18:16:20 2008
@@ -0,0 +1,94 @@
+diff --git vcl/unx/source/plugadapt/salplug.cxx vcl/unx/source/plugadapt/salplug.cxx
+index 335bb8f..da10725 100644
+--- vcl/unx/source/plugadapt/salplug.cxx
++++ vcl/unx/source/plugadapt/salplug.cxx
+@@ -55,13 +55,16 @@ typedef SalInstance*(*salFactoryProc)( oslModule pModule);
+ 
+ static oslModule pCloseModule = NULL;
+ 
+-#define DESKTOP_NONE 0
+-#define DESKTOP_UNKNOWN 1
+-#define DESKTOP_GNOME 2
+-#define DESKTOP_KDE 3
+-#define DESKTOP_CDE 4
++enum {
++    DESKTOP_NONE = 0,
++    DESKTOP_UNKNOWN,
++    DESKTOP_GNOME,
++    DESKTOP_KDE,
++    DESKTOP_KDE4,
++    DESKTOP_CDE
++};
+ 
+-static const char * desktop_strings[5] = { "none", "unknown", "GNOME", "KDE", "CDE" };
++static const char * desktop_strings[] = { "none", "unknown", "GNOME", "KDE", "KDE4", "CDE" };
+ 
+ static SalInstance* tryInstance( const OUString& rModuleBase )
+ {
+@@ -331,7 +334,15 @@ static OUString getNetWMName( Display* pDisplay )
+ static bool is_kde_desktop( Display* pDisplay )
+ {
+     if ( NULL != getenv( "KDE_FULL_SESSION" ) )
+-        return true;
++    {
++        const char *pVer = getenv( "KDE_SESSION_VERSION" );
++        if ( !pVer || pVer[0] == '0' )
++            return true; // does not exist => KDE3
++
++        rtl::OUString aVer( RTL_CONSTASCII_USTRINGPARAM( "3" ) );
++        if ( aVer.equalsIgnoreAsciiCaseAscii( pVer ) )
++            return true;
++    }
+     
+     // check for kwin
+     rtl::OUString aWM = getNetWMName( pDisplay );
+@@ -341,6 +352,22 @@ static bool is_kde_desktop( Display* pDisplay )
+     return false;
+ }
+ 
++static bool is_kde4_desktop( Display* /*pDisplay*/ )
++{
++    if ( NULL != getenv( "KDE_FULL_SESSION" ) )
++    {
++        rtl::OUString aVer( RTL_CONSTASCII_USTRINGPARAM( "4" ) );
++
++        const char *pVer = getenv( "KDE_SESSION_VERSION" );
++        if ( pVer && aVer.equalsIgnoreAsciiCaseAscii( pVer ) )
++            return true;
++    }
++
++    // TODO here we could check for KDE_SESSION_VERSION atom (must exist & equal 4)
++    
++    return false;
++}
++
+ static bool is_cde_desktop( Display* pDisplay )
+ {
+     void* pLibrary = NULL;
+@@ -370,6 +397,8 @@ static const char * get_desktop_environment()
+             pRet = desktop_strings[DESKTOP_CDE];
+         if ( aOver.equalsIgnoreAsciiCase( "kde" ) )
+             pRet = desktop_strings[DESKTOP_KDE];
++        if ( aOver.equalsIgnoreAsciiCase( "kde4" ) )
++            pRet = desktop_strings[DESKTOP_KDE4];
+         if ( aOver.equalsIgnoreAsciiCase( "gnome" ) )
+             pRet = desktop_strings[DESKTOP_GNOME];
+         if ( aOver.equalsIgnoreAsciiCase( "none" ) )
+@@ -412,6 +441,8 @@ static const char * get_desktop_environment()
+             
+                 if ( is_kde_desktop( pDisplay ) )
+                     pRet = desktop_strings[DESKTOP_KDE];
++                else if ( is_kde4_desktop( pDisplay ) )
++                    pRet = desktop_strings[DESKTOP_KDE4];
+                 else if ( is_gnome_desktop( pDisplay ) )
+                     pRet = desktop_strings[DESKTOP_GNOME];
+                 else if ( is_cde_desktop( pDisplay ) )
+@@ -443,6 +474,8 @@ static const char* autodetect_plugin()
+         pRet = "gtk";
+     else if( desktop == desktop_strings[DESKTOP_KDE] )
+         pRet = "kde";
++    else if( desktop == desktop_strings[DESKTOP_KDE4] )
++        pRet = "kde"; // TODO no kde4 vclplugin yet :-(
+     else
+         pRet = "gen";
+         

Added: trunk/patches/dev300/vcl-bigger-icons-kde-gnome.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/vcl-bigger-icons-kde-gnome.diff	Mon Oct 20 18:16:20 2008
@@ -0,0 +1,22 @@
+diff --git vcl/unx/source/window/salframe.cxx vcl/unx/source/window/salframe.cxx
+index bbb8480..82d713c 100644
+--- vcl/unx/source/window/salframe.cxx
++++ vcl/unx/source/window/salframe.cxx
+@@ -996,7 +996,7 @@ void X11SalFrame::SetIcon( USHORT nIcon )
+         {
+             const String& rWM( pDisplay_->getWMAdaptor()->getWindowManagerName() );
+             if( rWM.EqualsAscii( "KWin" ) )			// assume KDE is running
+-                iconSize = 16;
++                iconSize = 48;
+             static bool bGnomeIconSize = false;
+             static bool bGnomeChecked = false;
+             if( ! bGnomeChecked )
+@@ -1018,7 +1018,7 @@ void X11SalFrame::SetIcon( USHORT nIcon )
+                     XFree( pProps );
+             }
+             if( bGnomeIconSize )
+-                iconSize = 20;
++                iconSize = 48;
+         }
+ 
+         XWMHints Hints;