SVN commit 1016904 by lmurray:

Replace Ozone with Nitrogen as the default decoration and remove Ozone.
CCMAIL:kwin@kde.org


 M  +0 -1      clients/CMakeLists.txt  
 D             clients/ozone (directory)  
 M  +3 -3      kcmkwin/kwindecoration/kwindecoration.cpp  
 M  +1 -1      plugins.cpp  


--- trunk/KDE/kdebase/workspace/kwin/clients/CMakeLists.txt #1016903:1016904
@@ -8,7 +8,6 @@
 add_subdirectory( modernsystem ) 
 add_subdirectory( nitrogen ) 
 add_subdirectory( oxygen ) 
-add_subdirectory( ozone ) 
 add_subdirectory( quartz ) 
 add_subdirectory( redmond ) 
 add_subdirectory( web ) 
--- trunk/KDE/kdebase/workspace/kwin/kcmkwin/kwindecoration/kwindecoration.cpp #1016903:1016904
@@ -443,7 +443,7 @@
 
 	oldLibraryName = currentLibraryName;
 	currentLibraryName = conf.readEntry("PluginLib",
-					((QPixmap::defaultDepth() > 8) ? "kwin3_ozone" : "kwin3_plastik"));
+					((QPixmap::defaultDepth() > 8) ? "kwin3_nitrogen" : "kwin3_plastik"));
 	QString decoName = decorationName( currentLibraryName );
 
 	// If we are using the "default" kde client, use the "default" entry.
@@ -548,8 +548,8 @@
 // Don't set default for now
 //	decorationList->setSelected(
 //		decorationList->findItem( i18n("KDE 2") ), true );  // KDE classic client
-	decorationList->setCurrentItem( i18n("Ozone"), true );  // KDE classic client
-	slotChangeDecoration(i18n("Ozone"));
+	decorationList->setCurrentItem( i18n("Nitrogen"), true );  // KDE classic client
+	slotChangeDecoration(i18n("Nitrogen"));
 
 	buttonPositionWidget->setButtonsLeft(KDecorationOptions::defaultTitleButtonsLeft());
 	buttonPositionWidget->setButtonsRight(KDecorationOptions::defaultTitleButtonsRight());
--- trunk/KDE/kdebase/workspace/kwin/plugins.cpp #1016903:1016904
@@ -33,7 +33,7 @@
     : KDecorationPlugins( KGlobal::config())
     {
     defaultPlugin = (QPixmap::defaultDepth() > 8) ?
-            "kwin3_ozone" : "kwin3_plastik";
+            "kwin3_nitrogen" : "kwin3_plastik";
     loadPlugin( "" ); // load the plugin specified in cfg file
     }
 
_______________________________________________
kwin mailing list
kwin@kde.org
https://mail.kde.org/mailman/listinfo/kwin