Moved Nitrogen to Oxygen deco, and removed Nitrogen.

It is believed that Nitrogen is versatile enough to satisfy most users, and that it is 
good-looking enough to make Nuno happy.

CCMAIL: kwin@kde.org
BUG: 160627

svn path=/trunk/KDE/kdebase/workspace/; revision=1023636

clients/CMakeLists.txt

@@ -6,7 +6,7 @@ add_subdirectory( kde2 )
 add_subdirectory( keramik ) 
 add_subdirectory( laptop ) 
 add_subdirectory( modernsystem ) 
-add_subdirectory( nitrogen ) 
+add_subdirectory( oxygen ) 
 add_subdirectory( quartz ) 
 add_subdirectory( redmond ) 
 add_subdirectory( web ) 

clients/nitrogen/nitrogenclient.desktop

@@ -1,12 +0,0 @@
-# KDE Desktop Entry
-[Desktop Entry]
-Name=Nitrogen
-Name[nds]=Stickstoff
-Name[pt_BR]=Nitrogênio
-Name[sv]=Kväve
-Name[tg]=Нитроген
-Name[tr]=Azot
-Name[uk]=Азот
-Name[x-test]=xxNitrogenxx
-Name[zh_TW]=氮
-X-KDE-Library=kwin3_nitrogen

clients/oxygen/CMakeLists.txt

@@ -3,7 +3,7 @@ add_definitions ( -DAPP_VERSION=\\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKA
 add_subdirectory( config )
 
 ########### next target ###############
-set(kwin_nitrogen_SRCS
+set(kwin_oxygen_SRCS
      lib/helper.cpp
      lib/tileset.cpp
      nitrogen.cpp
@@ -17,17 +17,17 @@ set(kwin_nitrogen_SRCS
      x11util.cpp
   )
 
-kde4_add_plugin(kwin3_nitrogen ${kwin_nitrogen_SRCS})
+kde4_add_plugin(kwin3_oxygen ${kwin_oxygen_SRCS})
 target_link_libraries(
-    kwin3_nitrogen
+    kwin3_oxygen
     ${KDE4_KDEUI_LIBS}
     ${X11_X11_LIB}
     ${X11_Xrender_LIB}
     kdecorations
   )
 
-install(TARGETS kwin3_nitrogen  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kwin3_oxygen  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 ########### install files ###############
-install( FILES nitrogenclient.desktop  DESTINATION  ${DATA_INSTALL_DIR}/kwin/ )
+install( FILES oxygenclient.desktop  DESTINATION  ${DATA_INSTALL_DIR}/kwin/ )
 

clients/oxygen/config/CMakeLists.txt

@@ -1,7 +1,7 @@
 include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/lib  )
 
 
-set(kwin_nitrogen_config_PART_SRCS
+set(kwin_oxygen_config_PART_SRCS
     config.cpp
     itemmodel.cpp
     ../nitrogenconfiguration.cpp
@@ -16,14 +16,14 @@ set(kwin_nitrogen_config_PART_SRCS
     nitrogenshadowconfigurationui.cpp
   )
 
-kde4_add_plugin(kwin_nitrogen_config ${kwin_nitrogen_config_PART_SRCS})
+kde4_add_plugin(kwin_oxygen_config ${kwin_oxygen_config_PART_SRCS})
 
 target_link_libraries(
-    kwin_nitrogen_config
+    kwin_oxygen_config
     ${KDE4_KDEUI_LIBS}
     ${QT_QTGUI_LIBRARY}
     ${X11_X11_LIB}
     kdecorations
   )
 
-install(TARGETS kwin_nitrogen_config  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kwin_oxygen_config  DESTINATION ${PLUGIN_INSTALL_DIR} )

clients/oxygen/config/config.cpp

@@ -56,7 +56,7 @@ namespace Nitrogen
 
     KGlobal::locale()->insertCatalog("kwin_clients");
 
-    configuration_ = new KConfig( "nitrogenrc" );
+    configuration_ = new KConfig( "oxygenrc" );
     KConfigGroup configurationGroup( configuration_, "Windeco");
 
     userInterface_ = new NitrogenConfigurationUI( parent );
@@ -210,25 +210,6 @@ namespace Nitrogen
   }
   //_______________________________________________________________________
   void Config::aboutNitrogen( void )
-  {
-    KAboutData aboutData( "nitrogen", 0,
-      ki18n( "Nitrogen" ), APP_VERSION,
-      ki18n( "Oxygen based Window decoration for KDE" ), KAboutData::License_GPL,
-      KLocalizedString(),
-      KLocalizedString(),
-      ( "http://www.kde-look.org/content/show.php/Nitrogen?content=99551" ) );
-
-    aboutData.addAuthor(
-      ki18n( "Hugo Pereira Da Costa" ), ki18n( "Developer" ),
-      "hugo.pereira@free.fr",
-      "http://hugo.pereira.free.fr/index.php" );
-
-    aboutData.addCredit( ki18n( "Oxygen team" ) );
-
-    // create dialog
-    KAboutApplicationDialog( &aboutData, 0 ).exec();
-
-
-  }
+  {}
 
 }

clients/oxygen/nitrogen.cpp

@@ -111,7 +111,7 @@ namespace Nitrogen
     bool changed( false );
 
     // create a config object
-    KConfig config("nitrogenrc");
+    KConfig config("oxygenrc");
     KConfigGroup group( config.group("Windeco") );
     NitrogenConfiguration configuration( group );
     if( !( configuration == defaultConfiguration() ) )

clients/oxygen/nitrogenclient.cpp

@@ -50,7 +50,7 @@ using namespace std;
 namespace Nitrogen
 {
 
-  K_GLOBAL_STATIC_WITH_ARGS(OxygenHelper, globalHelper, ("nitrogenDeco"))
+  K_GLOBAL_STATIC_WITH_ARGS(OxygenHelper, globalHelper, ("oxygenDeco"))
 
   //___________________________________________
   OxygenHelper *nitrogenHelper()
@@ -95,7 +95,7 @@ namespace Nitrogen
 
   //___________________________________________
   QString NitrogenClient::visibleName() const
-  { return i18n("Nitrogen"); }
+  { return i18n("Oxygen"); }
 
   //___________________________________________
   void NitrogenClient::init()

clients/oxygen/oxygenclient.desktop

@@ -0,0 +1,29 @@
+# KDE Desktop Entry
+[Desktop Entry]
+Name=Oxygen
+Name[ar]=أكسجين
+Name[bn]=অক্সিজেন
+Name[csb]=Krziseń
+Name[es]=Oxígeno
+Name[gu]=ઓક્સિજન
+Name[hi]=आक्सीजन
+Name[hne]=आक्सीजन
+Name[kk]=Оттегі
+Name[km]=អុកស៊ីហ្សែន
+Name[kn]=ಆಕ್ಸಿಜನ್
+Name[mai]=आक्सीजन
+Name[mk]=Оксиген
+Name[ml]=ഓക്സിജന്‍
+Name[mr]=आक्सीजन
+Name[ne]=अक्सिजन
+Name[nn]=Oksygen
+Name[or]=ଅକ୍ସିଜେନ
+Name[pa]=ਆਕਸੀਜਨ
+Name[se]=Oksygena
+Name[sr]=Кисеоник
+Name[sr@latin]=Kiseonik
+Name[ta]=ஆக்ஸிஜன்
+Name[th]=รูปแบบ Oxygen
+Name[wa]=Ocsidjinne
+Name[x-test]=xxOxygenxx
+X-KDE-Library=kwin3_oxygen

kcmkwin/kwindecoration/kwindecoration.cpp

@@ -443,12 +443,12 @@ void KWinDecorationModule::readConfig( const KConfigGroup & conf )
 
 	oldLibraryName = currentLibraryName;
 	currentLibraryName = conf.readEntry("PluginLib",
-					((QPixmap::defaultDepth() > 8) ? "kwin3_nitrogen" : "kwin3_plastik"));
+					((QPixmap::defaultDepth() > 8) ? "kwin3_oxygen" : "kwin3_plastik"));
 	QString decoName = decorationName( currentLibraryName );
 
 	if (decoName.isEmpty())
 	{ // Selected decoration doesn't exist, use the default
-		currentLibraryName = ((QPixmap::defaultDepth() > 8) ? "kwin3_nitrogen" : "kwin3_plastik");
+		currentLibraryName = ((QPixmap::defaultDepth() > 8) ? "kwin3_oxygen" : "kwin3_plastik");
 		decoName = decorationName( currentLibraryName );
 	}
 
@@ -554,8 +554,8 @@ void KWinDecorationModule::defaults()
 // Don't set default for now
 //	decorationList->setSelected(
 //		decorationList->findItem( i18n("KDE 2") ), true );  // KDE classic client
-	decorationList->setCurrentItem( i18n("Nitrogen"), true );  // KDE classic client
-	slotChangeDecoration(i18n("Nitrogen"));
+	decorationList->setCurrentItem( i18n("Oxygen"), true );  // KDE classic client
+	slotChangeDecoration(i18n("Oxygen"));
 
 	buttonPositionWidget->setButtonsLeft(KDecorationOptions::defaultTitleButtonsLeft());
 	buttonPositionWidget->setButtonsRight(KDecorationOptions::defaultTitleButtonsRight());

plugins.cpp

@@ -33,7 +33,7 @@ PluginMgr::PluginMgr()
     : KDecorationPlugins( KGlobal::config())
     {
     defaultPlugin = (QPixmap::defaultDepth() > 8) ?
-            "kwin3_nitrogen" : "kwin3_plastik";
+            "kwin3_oxygen" : "kwin3_plastik";
     loadPlugin( "" ); // load the plugin specified in cfg file
     }