Hello community,
here is the log from the commit of package oxygen-gtk for openSUSE:Factory checked in at 2011-12-21 10:01:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/oxygen-gtk (Old)
and /work/SRC/openSUSE:Factory/.oxygen-gtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen-gtk", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/oxygen-gtk/oxygen-gtk.changes 2011-11-29 16:24:37.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.oxygen-gtk.new/oxygen-gtk.changes 2011-12-21 10:01:51.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Dec 15 19:18:47 UTC 2011 - asterios.dramis@gmail.com
+
+- Update to 1.1.6:
+ Bugfixes and improvements include:
+ * Color role used to render the text for some widgets (mostly buttons).
+ * Conflicts between oxygen's window grabbing feature and ecclipse.
+ * Rendering issues with the Komodo text editor.
+- Removed oxygen-gtk-compat.patch that fixed compilation with older GTK+
+ versions (fixed upstream).
+
+-------------------------------------------------------------------
Old:
----
oxygen-gtk-1.1.5.tar.bz2
oxygen-gtk-compat.patch
New:
----
oxygen-gtk-1.1.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ oxygen-gtk.spec ++++++
--- /var/tmp/diff_new_pack.sGngZQ/_old 2011-12-21 10:01:52.000000000 +0100
+++ /var/tmp/diff_new_pack.sGngZQ/_new 2011-12-21 10:01:52.000000000 +0100
@@ -16,17 +16,15 @@
#
-
Name: oxygen-gtk
-Version: 1.1.5
-Release: 1
-License: LGPL-2.0+
+Version: 1.1.6
+Release: 0
Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK
-Url: https://projects.kde.org/projects/playground/artwork/oxygen-gtk
+License: LGPL-2.0+
Group: System/GUI/KDE
+Url: https://projects.kde.org/projects/playground/artwork/oxygen-gtk
Source0: ftp://ftp.kde.org/pub/kde/stable/oxygen-gtk/%{version}/src/%{name}-%{version}.tar.bz2
Source100: baselibs.conf
-Patch1: oxygen-gtk-compat.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig(cairo)
@@ -49,7 +47,6 @@
%prep
%setup -q
-%patch1 -p1
%build
mkdir -p build
@@ -71,9 +68,6 @@
%make_install
popd
-%clean
-test %{buildroot} != "/" && rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO
++++++ oxygen-gtk-1.1.5.tar.bz2 -> oxygen-gtk-1.1.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/.kdev4/oxygen-gtk.kdev4 new/oxygen-gtk-1.1.6/.kdev4/oxygen-gtk.kdev4
--- old/oxygen-gtk-1.1.5/.kdev4/oxygen-gtk.kdev4 1970-01-01 01:00:00.000000000 +0100
+++ new/oxygen-gtk-1.1.6/.kdev4/oxygen-gtk.kdev4 2011-12-14 11:16:17.000000000 +0100
@@ -0,0 +1,15 @@
+[Buildset]
+BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x14\x00o\x00x\x00y\x00g\x00e\x00n\x00-\x00g\x00t\x00k)
+
+[CMake]
+BuildDirs=/media/hd_linux/hpereira/gtk/build/oxygen-gtk
+CMakeDir=/usr/share/cmake/Modules
+Current CMake Binary=file:///usr/bin/cmake
+CurrentBuildDir=file:///media/hd_linux/hpereira/gtk/build/oxygen-gtk
+CurrentBuildType=Debug
+CurrentInstallDir=
+Extra Arguments=
+ProjectRootRelative=./
+
+[Project]
+VersionControlSupport=kdevgit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/CMakeLists.txt new/oxygen-gtk-1.1.6/CMakeLists.txt
--- old/oxygen-gtk-1.1.5/CMakeLists.txt 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/CMakeLists.txt 2011-12-14 11:16:17.000000000 +0100
@@ -13,7 +13,7 @@
set( CPACK_PACKAGE_VENDOR "hugo@oxygen-icons.org" )
set( CPACK_PACKAGE_VERSION_MAJOR "1" )
set( CPACK_PACKAGE_VERSION_MINOR "1" )
-set( CPACK_PACKAGE_VERSION_PATCH "5" )
+set( CPACK_PACKAGE_VERSION_PATCH "6" )
set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" )
##################################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/demo/oxygendemodialog.cpp new/oxygen-gtk-1.1.6/demo/oxygendemodialog.cpp
--- old/oxygen-gtk-1.1.5/demo/oxygendemodialog.cpp 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/demo/oxygendemodialog.cpp 2011-12-14 11:16:17.000000000 +0100
@@ -30,6 +30,12 @@
#include "oxygentabdemowidget.h"
#include
+
+// Older (such as 2.20.1) GTK versions had different name for this
+#ifndef GDK_KEY_Q
+#define GDK_KEY_Q GDK_Q
+#endif
+
#include <iostream>
#include <sstream>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/oxygen.diff new/oxygen-gtk-1.1.6/oxygen.diff
--- old/oxygen-gtk-1.1.5/oxygen.diff 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/oxygen.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-diff --git a/src/oxygentileset.cpp b/src/oxygentileset.cpp
-index 371e123..5d4def2 100644
---- a/src/oxygentileset.cpp
-+++ b/src/oxygentileset.cpp
-@@ -212,9 +212,9 @@ namespace Oxygen
-
- } else {
-
-- #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
-- Cairo::Surface tile( cairo_surface_create_for_rectangle( source, sx, sy, sw, sh ) );
-- #else
-+// #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
-+// Cairo::Surface tile( cairo_surface_create_for_rectangle( source, sx, sy, sw, sh ) );
-+// #else
- Cairo::Surface tile( cairo_surface_create_similar( source, CAIRO_CONTENT_COLOR_ALPHA, sw, sh ) );
- {
- Cairo::Context local( tile );
-@@ -222,7 +222,7 @@ namespace Oxygen
- cairo_rectangle( local, 0, 0, sw, sh );
- cairo_fill( local );
- }
-- #endif
-+// #endif
-
- cairo_set_source_surface( context, tile, 0, 0 );
- cairo_pattern_set_extend( cairo_get_source( context ), CAIRO_EXTEND_REPEAT );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/rc/gtkrc new/oxygen-gtk-1.1.6/rc/gtkrc
--- old/oxygen-gtk-1.1.5/rc/gtkrc 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/rc/gtkrc 2011-12-14 11:16:17.000000000 +0100
@@ -23,9 +23,6 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1301, USA.
-# global settings
-gtk-alternative-button-order = 1
-
# oxygen's generic style options
style "oxygen-default"
{
@@ -168,8 +165,6 @@
style "oxygen-combobox-frame" = "oxygen-default"
{
- # must set combobox frame x thickness to 0, otherwise there
- # is a dead area between combobox text and button
xthickness = 4
ythickness = 4
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/src/animations/oxygenbackgroundhintengine.cpp new/oxygen-gtk-1.1.6/src/animations/oxygenbackgroundhintengine.cpp
--- old/oxygen-gtk-1.1.5/src/animations/oxygenbackgroundhintengine.cpp 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/src/animations/oxygenbackgroundhintengine.cpp 2011-12-14 11:16:17.000000000 +0100
@@ -69,7 +69,7 @@
if( contains( data ) ) return false;
// set hint
- GdkDisplay *display( gdk_window_get_display( window ) );
+ GdkDisplay *display( gtk_widget_get_display( topLevel ) );
if( display && _backgroundGradientAtom && (hints&BackgroundGradient) )
{
unsigned long uLongValue( true );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/src/animations/oxygeninnershadowdata.cpp new/oxygen-gtk-1.1.6/src/animations/oxygeninnershadowdata.cpp
--- old/oxygen-gtk-1.1.5/src/animations/oxygeninnershadowdata.cpp 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/src/animations/oxygeninnershadowdata.cpp 2011-12-14 11:16:17.000000000 +0100
@@ -103,11 +103,14 @@
GdkWindow* window(gtk_widget_get_window(widget));
if(
+
// check window
window &&
- gdk_display_supports_composite( gdk_window_get_display( window ) ) &&
gdk_window_get_window_type( window ) == GDK_WINDOW_CHILD &&
+ // check compositing
+ gdk_display_supports_composite( gtk_widget_get_display( widget ) ) &&
+
// check widget type (might move to blacklist method)
( G_OBJECT_TYPE_NAME(widget) != std::string("GtkPizza") ) &&
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/src/oxygenapplicationname.cpp new/oxygen-gtk-1.1.6/src/oxygenapplicationname.cpp
--- old/oxygen-gtk-1.1.5/src/oxygenapplicationname.cpp 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/src/oxygenapplicationname.cpp 2011-12-14 11:16:17.000000000 +0100
@@ -55,7 +55,6 @@
_name = Unknown;
if( pidAppName == "opera" ) _name = Opera;
- else if( pidAppName.find( "komodo" ) != std::string::npos ) _name = Komodo;
else if( gtkAppName == "eclipse" || gtkAppName == "Eclipse" ) _name = Eclipse;
else if( pidAppName == "java" ) {
@@ -81,6 +80,7 @@
"icecat",
"icedove",
"xulrunner",
+ "komodo",
""
};
@@ -120,7 +120,6 @@
// check application name
if( !(
- isKomodo() ||
isXul() ||
isAcrobat() ||
isJavaSwt() ||
@@ -177,7 +176,6 @@
{
default:
case Unknown: out << "Unknown"; break;
- case Komodo: out << "Komodo"; break;
case Acrobat: out << "Acrobat"; break;
case XUL: out << "XUL (Mozilla)"; break;
case Gimp: out << "Gimp"; break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/src/oxygenapplicationname.h new/oxygen-gtk-1.1.6/src/oxygenapplicationname.h
--- old/oxygen-gtk-1.1.5/src/oxygenapplicationname.h 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/src/oxygenapplicationname.h 2011-12-14 11:16:17.000000000 +0100
@@ -45,7 +45,6 @@
Java,
JavaSwt,
Eclipse,
- Komodo
};
//! stores application name and provides some utility functions
@@ -78,7 +77,6 @@
//@{
bool isAcrobat( void ) const { return _name == Acrobat; }
- bool isKomodo( void ) const { return _name == Komodo; }
bool isXul( void ) const { return _name == XUL; }
bool isGimp( void ) const { return _name == Gimp; }
bool isOpenOffice( void ) const { return _name == OpenOffice; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/src/oxygengtkrc.cpp new/oxygen-gtk-1.1.6/src/oxygengtkrc.cpp
--- old/oxygen-gtk-1.1.5/src/oxygengtkrc.cpp 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/src/oxygengtkrc.cpp 2011-12-14 11:16:17.000000000 +0100
@@ -92,6 +92,39 @@
}
//_________________________________________________
+ void Gtk::RC::matchClassToSection( const std::string& content, const std::string& name )
+ {
+ if( std::find( _sections.begin(), _sections.end(), name ) == _sections.end() )
+ { std::cerr << "Gtk::RC::matchClassToSection - unable to find section named " << name << std::endl; }
+
+ std::ostringstream what;
+ what << "class \"" << content << "\" style \"" << name << "\"";
+ addToRootSection( what.str() );
+ }
+
+ //_________________________________________________
+ void Gtk::RC::matchWidgetToSection( const std::string& content, const std::string& name )
+ {
+ if( std::find( _sections.begin(), _sections.end(), name ) == _sections.end() )
+ { std::cerr << "Gtk::RC::matchWidgetToSection - unable to find section named " << name << std::endl; }
+
+ std::ostringstream what;
+ what << "widget \"" << content << "\" style \"" << name << "\"";
+ addToRootSection( what.str() );
+ }
+
+ //_________________________________________________
+ void Gtk::RC::matchWidgetClassToSection( const std::string& content, const std::string& name )
+ {
+ if( std::find( _sections.begin(), _sections.end(), name ) == _sections.end() )
+ { std::cerr << "Gtk::RC::matchWidgetClassToSection - unable to find section named " << name << std::endl; }
+
+ std::ostringstream what;
+ what << "widget_class \"" << content << "\" style \"" << name << "\"";
+ addToRootSection( what.str() );
+ }
+
+ //_________________________________________________
void Gtk::RC::setCurrentSection( const std::string& name )
{
if( std::find( _sections.begin(), _sections.end(), name ) == _sections.end() )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/src/oxygengtkrc.h new/oxygen-gtk-1.1.6/src/oxygengtkrc.h
--- old/oxygen-gtk-1.1.5/src/oxygengtkrc.h 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/src/oxygengtkrc.h 2011-12-14 11:16:17.000000000 +0100
@@ -101,6 +101,11 @@
void addToRootSection( const std::string& content )
{ addToSection( _rootSectionName, content ); }
+ //! match given widget selection to given section
+ void matchClassToSection( const std::string& content, const std::string& name );
+ void matchWidgetToSection( const std::string& content, const std::string& name );
+ void matchWidgetClassToSection( const std::string& content, const std::string& name );
+
//! default section name
static const std::string& defaultSection( void )
{ return _defaultSectionName; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/src/oxygenqtsettings.cpp new/oxygen-gtk-1.1.6/src/oxygenqtsettings.cpp
--- old/oxygen-gtk-1.1.5/src/oxygenqtsettings.cpp 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/src/oxygenqtsettings.cpp 2011-12-14 11:16:17.000000000 +0100
@@ -129,6 +129,11 @@
initArgb();
}
+
+ // dialog button ordering
+ GtkSettings* settings( gtk_settings_get_default() );
+ gtk_settings_set_long_property( settings, "gtk-alternative-button-order", 1, "oxygen-gtk" );
+
// configuration path
_kdeConfigPathList = kdeConfigPathList();
@@ -176,7 +181,7 @@
// deal with pathbar button margins
// this needs to be done programatically in order to properly account for RTL locales
- _rc.addSection( "oxygen-pathbutton", Gtk::RC::defaultSection() );
+ _rc.addSection( "oxygen-pathbutton-internal", Gtk::RC::defaultSection() );
_rc.addToCurrentSection( " GtkButton::inner-border = { 2, 2, 1, 0 }" );
if( gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL )
@@ -190,7 +195,7 @@
}
- _rc.addToRootSection( "widget_class \"*PathBar.GtkToggleButton\" style \"oxygen-pathbutton\"" );
+ _rc.matchWidgetClassToSection( "*PathBar.GtkToggleButton", "oxygen-pathbutton-internal" );
// print generated Gtkrc and commit
#if OXYGEN_DEBUG
@@ -607,7 +612,7 @@
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " text[INSENSITIVE]", _palette.color( Palette::Disabled, Palette::Text ) ) );
// buttons
- _rc.addSection( "oxygen-buttons", Gtk::RC::defaultSection() );
+ _rc.addSection( "oxygen-buttons-internal", Gtk::RC::defaultSection() );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " bg[NORMAL]", _palette.color( Palette::Button ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " bg[ACTIVE]", _palette.color( Palette::Button ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " bg[PRELIGHT]", _palette.color( Palette::Button ) ) );
@@ -616,35 +621,38 @@
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " fg[ACTIVE]", _palette.color( Palette::ButtonText ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " fg[PRELIGHT]", _palette.color( Palette::ButtonText ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " fg[INSENSITIVE]", _palette.color( Palette::Disabled, Palette::ButtonText ) ) );
- _rc.addToRootSection( "class \"GtkOptionMenu\" style \"oxygen-buttons\"" );
- _rc.addToRootSection( "widget_class \"*<GtkButton>.<GtkLabel>\" style \"oxygen-buttons\"" );
+ _rc.matchClassToSection( "*Button", "oxygen-buttons-internal" );
+ _rc.matchClassToSection( "GtkOptionMenu", "oxygen-buttons-internal" );
+ _rc.matchWidgetClassToSection( "*<GtkButton>.<GtkLabel>", "oxygen-buttons-internal" );
+ _rc.matchWidgetClassToSection( "*<GtkButton>.<GtkAlignment>.<GtkBox>.<GtkLabel>", "oxygen-buttons-internal" );
- _rc.addSection( "oxygen-combobox", "oxygen-buttons" );
+ // combobox
+ _rc.addSection( "oxygen-combobox-internal", "oxygen-buttons-internal" );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " text[NORMAL]", _palette.color( Palette::ButtonText ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " text[ACTIVE]", _palette.color( Palette::ButtonText ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " text[PRELIGHT]", _palette.color( Palette::ButtonText ) ) );
- _rc.addToCurrentSection( Gtk::RCOptionstd::string( " text[INSENSITIVE]", _palette.color( Palette::Disabled, Palette::ButtonText ) ) ); _rc.addToRootSection( "class \"*Button\" style \"oxygen-buttons\"" );
- _rc.addToRootSection( "widget_class \"*<GtkComboBox>.<GtkCellView>\" style \"oxygen-combobox\"" );
+ _rc.addToCurrentSection( Gtk::RCOptionstd::string( " text[INSENSITIVE]", _palette.color( Palette::Disabled, Palette::ButtonText ) ) );
+ _rc.matchWidgetClassToSection( "*<GtkComboBox>.*<GtkCellView>", "oxygen-combobox-internal" );
// checkboxes and radio buttons
- _rc.addSection( "oxygen-checkbox-buttons", "oxygen-buttons" );
+ _rc.addSection( "oxygen-checkbox-buttons-internal", "oxygen-buttons-internal" );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " fg[NORMAL]", _palette.color( Palette::WindowText ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " fg[ACTIVE]", _palette.color( Palette::WindowText ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " fg[PRELIGHT]", _palette.color( Palette::WindowText ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " fg[INSENSITIVE]", _palette.color( Palette::Disabled, Palette::WindowText ) ) );
- _rc.addToRootSection( "widget_class \"*<GtkCheckButton>.<GtkLabel>\" style \"oxygen-checkbox-buttons\"" );
+ _rc.matchWidgetClassToSection( "*<GtkCheckButton>.<GtkLabel>", "oxygen-checkbox-buttons-internal" );
// progressbar labels
- _rc.addSection( "oxygen-progressbar-labels", "oxygen-progressbar" );
+ _rc.addSection( "oxygen-progressbar-internal", Gtk::RC::defaultSection() );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " text[NORMAL]", _palette.color( Palette::WindowText ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " text[ACTIVE]", _palette.color( Palette::WindowText ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " text[PRELIGHT]", _palette.color( Palette::WindowText ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " text[INSENSITIVE]", _palette.color( Palette::Disabled, Palette::WindowText ) ) );
- _rc.addToRootSection( "class \"GtkProgressBar\" style \"oxygen-progressbar-labels\"" );
+ _rc.matchClassToSection( "GtkProgressBar", "oxygen-progressbar-internal" );
// menu items
- _rc.addSection( "oxygen-menubar-item", "oxygen-menu-font" );
+ _rc.addSection( "oxygen-menubar-item-internal", "oxygen-menu-font-internal" );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " text[NORMAL]", _palette.color( Palette::Text ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " fg[NORMAL]", _palette.color( Palette::WindowText ) ) );
@@ -668,42 +676,42 @@
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " fg[ACTIVE]", _palette.color( Palette::WindowText ) ) );
}
- _rc.addToRootSection( "widget_class \"*<GtkMenuItem>.<GtkLabel>\" style \"oxygen-menubar-item\"" );
+ _rc.matchWidgetClassToSection( "*<GtkMenuItem>.<GtkLabel>", "oxygen-menubar-item-internal" );
if( _menuHighlightMode == MM_STRONG )
{
- _rc.addSection( "oxygen-menu-item", "oxygen-menubar-item" );
+ _rc.addSection( "oxygen-menu-item-internal", "oxygen-menubar-item-internal" );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " text[PRELIGHT]", _palette.color( Palette::SelectedText ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " fg[PRELIGHT]", _palette.color( Palette::SelectedText ) ) );
- _rc.addToRootSection( "widget_class \"*<GtkMenu>.<GtkMenuItem>.<GtkLabel>\" style \"oxygen-menu-item\"" );
+ _rc.matchWidgetClassToSection( "*<GtkMenu>.<GtkMenuItem>.<GtkLabel>", "oxygen-menu-item-internal" );
}
// text entries
- _rc.addSection( "oxygen-entry", Gtk::RC::defaultSection() );
+ _rc.addSection( "oxygen-entry-internal", Gtk::RC::defaultSection() );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " bg[NORMAL]", _palette.color( Palette::Base ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " bg[INSENSITIVE]", _palette.color( Palette::Disabled, Palette::Base ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " base[INSENSITIVE]", _palette.color( Palette::Disabled, Palette::Base ) ) );
- _rc.addToRootSection( "class \"GtkSpinButton\" style \"oxygen-entry\"" );
- _rc.addToRootSection( "class \"GtkEntry\" style \"oxygen-entry\"" );
- _rc.addToRootSection( "class \"GtkTextView\" style \"oxygen-entry\"" );
- _rc.addToRootSection( "widget_class \"*<GtkComboBoxEntry>.<GtkButton>\" style \"oxygen-entry\"" );
- _rc.addToRootSection( "widget_class \"*<GtkCombo>.<GtkButton>\" style \"oxygen-entry\"" );
+ _rc.matchClassToSection( "GtkSpinButton", "oxygen-entry-internal" );
+ _rc.matchClassToSection( "GtkEntry", "oxygen-entry-internal" );
+ _rc.matchClassToSection( "GtkTextView", "oxygen-entry-internal" );
+ _rc.matchWidgetClassToSection( "*<GtkComboBoxEntry>.<GtkButton>", "oxygen-entry-internal" );
+ _rc.matchWidgetClassToSection( "*<GtkCombo>.<GtkButton>", "oxygen-entry-internal" );
// tooltips
- _rc.addSection( "oxygen-tooltips", Gtk::RC::defaultSection() );
+ _rc.addSection( "oxygen-tooltips-internal", Gtk::RC::defaultSection() );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " bg[NORMAL]", _palette.color( Palette::Tooltip ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " fg[NORMAL]", _palette.color( Palette::TooltipText ) ) );
_rc.addToCurrentSection( Gtk::RCOption<int>( " xthickness", 3 ) );
_rc.addToCurrentSection( Gtk::RCOption<int>( " ythickness", 3 ) );
- _rc.addToRootSection( "widget \"gtk-tooltip*\" style \"oxygen-tooltips\"" );
+ _rc.matchWidgetToSection( "gtk-tooltip*", "oxygen-tooltips-internal" );
// special case for google chrome
/* based on http://code.google.com/p/chromium/wiki/LinuxGtkThemeIntegration */
- _rc.addSection( "oxygen-chrome-gtk-frame", Gtk::RC::defaultSection() );
+ _rc.addSection( "oxygen-chrome-gtk-frame-internal", Gtk::RC::defaultSection() );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " ChromeGtkFrame::frame-color", _palette.color( Palette::Window ) ) );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " ChromeGtkFrame::inactive-frame-color", _palette.color( Palette::Window ) ) );
- _rc.addToRootSection( "class \"ChromeGtkFrame\" style \"oxygen-chrome-gtk-frame\"" );
+ _rc.matchClassToSection( "ChromeGtkFrame", "oxygen-chrome-gtk-frame-internal" );
}
@@ -771,16 +779,16 @@
if( fonts[FontInfo::Menu].isValid() )
{
- _rc.addSection( "oxygen-menu-font", Gtk::RC::defaultSection() );
+ _rc.addSection( "oxygen-menu-font-internal", Gtk::RC::defaultSection() );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " font_name", fonts[FontInfo::Menu].toString() ) );
- _rc.addToRootSection( "widget_class \"*<GtkMenuItem>.<GtkLabel>\" style \"oxygen-menu-font\"" );
+ _rc.matchWidgetClassToSection( "*<GtkMenuItem>.<GtkLabel>", "oxygen-menu-font-internal" );
}
if( fonts[FontInfo::ToolBar].isValid() )
{
- _rc.addSection( "oxygen-toolbar-font", Gtk::RC::defaultSection() );
+ _rc.addSection( "oxygen-toolbar-font-internal", Gtk::RC::defaultSection() );
_rc.addToCurrentSection( Gtk::RCOptionstd::string( " font_name", fonts[FontInfo::ToolBar].toString() ) );
- _rc.addToRootSection( "widget_class \"*<GtkToolbar>.*\" style \"oxygen-toolbar-font\"" );
+ _rc.matchWidgetClassToSection( "*<GtkToolbar>.*", "oxygen-toolbar-font-internal" );
}
// don't check for section and tag presence - use default font if not present
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/src/oxygenshadowhelper.cpp new/oxygen-gtk-1.1.6/src/oxygenshadowhelper.cpp
--- old/oxygen-gtk-1.1.5/src/oxygenshadowhelper.cpp 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/src/oxygenshadowhelper.cpp 2011-12-14 11:16:17.000000000 +0100
@@ -192,8 +192,7 @@
hint == GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU ||
hint == GDK_WINDOW_TYPE_HINT_POPUP_MENU ||
hint == GDK_WINDOW_TYPE_HINT_COMBO ||
- hint == GDK_WINDOW_TYPE_HINT_TOOLTIP ||
- ( hint == GDK_WINDOW_TYPE_HINT_UTILITY && !widget->parent && _applicationName.isXul(widget) );
+ hint == GDK_WINDOW_TYPE_HINT_TOOLTIP;
}
//______________________________________________
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/src/oxygenstyle.cpp new/oxygen-gtk-1.1.6/src/oxygenstyle.cpp
--- old/oxygen-gtk-1.1.5/src/oxygenstyle.cpp 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/src/oxygenstyle.cpp 2011-12-14 11:16:17.000000000 +0100
@@ -393,7 +393,7 @@
// find groupbox parent
GtkWidget* parent( Gtk::gtk_parent_groupbox( widget ) );
- if( !parent ) return false;
+ if( !( parent && animations().groupBoxEngine().contains( parent ) ) ) return false;
// toplevel window information and relative positioning
gint ww(0), wh(0);
@@ -765,7 +765,7 @@
cairo_rectangle( context, x, y, w, h );
cairo_fill( context );
- } else if( widget && animations().groupBoxEngine().contains( Gtk::gtk_parent_groupbox( widget ) ) ) {
+ } else {
// add hole if required (this can be done before translating the context)
Cairo::Context context( window, clipRect );
@@ -774,17 +774,10 @@
// normal window background
renderWindowBackground( context, window, 0L, clipRect, x, y, w, h, options, tiles);
- // groupbox background. Pass NoFill option in order not to render the surrounding frame
- renderGroupBoxBackground( context, window, widget, clipRect, x, y, w, h, options | Blend | NoFill, tiles );
-
- } else {
-
- // add hole if required (this can be done before translating the context)
- Cairo::Context context( window, clipRect );
- renderHoleMask( context, x, y, w, h, tiles, sideMargin );
-
- // normal window background.
- renderWindowBackground( context, window, 0L, clipRect, x, y, w, h, options, tiles);
+ // possible groupbox background
+ // Pass NoFill option in order not to render the surrounding frame
+ if( widget )
+ { renderGroupBoxBackground( context, window, widget, clipRect, x, y, w, h, options | Blend | NoFill, tiles ); }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/src/oxygenstylewrapper.cpp new/oxygen-gtk-1.1.6/src/oxygenstylewrapper.cpp
--- old/oxygen-gtk-1.1.5/src/oxygenstylewrapper.cpp 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/src/oxygenstylewrapper.cpp 2011-12-14 11:16:17.000000000 +0100
@@ -2044,6 +2044,7 @@
if( d.isFrame() && Gtk::gtk_widget_is_groupbox( widget ) )
{
+
Style::instance().renderGroupBoxFrame( window, widget, clipRect, x-1, y-1, w+2, h+2, Blend );
} else {
@@ -3534,15 +3535,20 @@
void StyleWrapper::instanceInit( OxygenStyle* self )
{
- // hooks
+ // animations hooks
Style::instance().animations().initializeHooks();
- Style::instance().windowManager().initializeHooks();
+
+ // shadow hooks
Style::instance().shadowHelper().initializeHooks();
- // also initialize dbus
+ // window manager hooks
+ if( !Style::instance().settings().applicationName().isEclipse() )
+ { Style::instance().windowManager().initializeHooks(); }
+
+ // dbus
Oxygen::DBus::instance();
- // initialize argb hooks
+ // argb hooks
if(
Style::instance().settings().argbEnabled() &&
!Style::instance().settings().applicationName().isXul() )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk-1.1.5/src/oxygentheme.cpp new/oxygen-gtk-1.1.6/src/oxygentheme.cpp
--- old/oxygen-gtk-1.1.5/src/oxygentheme.cpp 2011-11-17 14:20:47.000000000 +0100
+++ new/oxygen-gtk-1.1.6/src/oxygentheme.cpp 2011-12-14 11:16:17.000000000 +0100
@@ -47,19 +47,16 @@
Oxygen::RCStyle::registerType( module );
Oxygen::StyleWrapper::registerType( module );
- // disable all animations for komodo editor and openoffice
+ // disable all animations for openoffice
if(
- Oxygen::Style::instance().settings().applicationName().isOpenOffice() ||
- Oxygen::Style::instance().settings().applicationName().isKomodo() )
+ Oxygen::Style::instance().settings().applicationName().isOpenOffice() )
{
Oxygen::Style::instance().animations().setEnabled( false );
Oxygen::Style::instance().animations().setInnerShadowsEnabled( false );
+ // re-enable combobox animations
+ Oxygen::Style::instance().animations().comboBoxEngine().setEnabled( true );
}
- // re-enable combobox animations
- if( Oxygen::Style::instance().settings().applicationName().isOpenOffice() )
- { Oxygen::Style::instance().animations().comboBoxEngine().setEnabled( true ); }
-
}
//_________________________________________________
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org