From 8eecf6375cdf1066c721f42c4c7e1210eeda8c11 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Tue, 15 Sep 2009 06:25:06 +0000 Subject: [PATCH] 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 | 2 +- clients/nitrogen/nitrogenclient.desktop | 12 -------- clients/{nitrogen => oxygen}/CMakeLists.txt | 10 +++---- .../config/CMakeLists.txt | 8 ++--- .../{nitrogen => oxygen}/config/config.cpp | 23 ++------------- clients/{nitrogen => oxygen}/config/config.h | 0 .../{nitrogen => oxygen}/config/itemmodel.cpp | 0 .../{nitrogen => oxygen}/config/itemmodel.h | 0 .../{nitrogen => oxygen}/config/listmodel.h | 0 .../config/nitrogenconfigurationui.cpp | 0 .../config/nitrogenconfigurationui.h | 0 .../config/nitrogendetectwidget.cpp | 0 .../config/nitrogendetectwidget.h | 0 .../config/nitrogenexceptiondialog.cpp | 0 .../config/nitrogenexceptiondialog.h | 0 .../config/nitrogenexceptionlistwidget.cpp | 0 .../config/nitrogenexceptionlistwidget.h | 0 .../config/nitrogenexceptionmodel.cpp | 0 .../config/nitrogenexceptionmodel.h | 0 .../config/nitrogenshadowconfigurationui.cpp | 0 .../config/nitrogenshadowconfigurationui.h | 0 clients/{nitrogen => oxygen}/nitrogen.cpp | 2 +- clients/{nitrogen => oxygen}/nitrogen.h | 0 .../{nitrogen => oxygen}/nitrogenbutton.cpp | 0 clients/{nitrogen => oxygen}/nitrogenbutton.h | 0 .../{nitrogen => oxygen}/nitrogenclient.cpp | 4 +-- clients/{nitrogen => oxygen}/nitrogenclient.h | 0 .../nitrogenconfiguration.cpp | 0 .../nitrogenconfiguration.h | 0 .../nitrogenexception.cpp | 0 .../{nitrogen => oxygen}/nitrogenexception.h | 0 .../nitrogenexceptionlist.cpp | 0 .../nitrogenexceptionlist.h | 0 .../nitrogenshadowconfiguration.cpp | 0 .../nitrogenshadowconfiguration.h | 0 .../{nitrogen => oxygen}/nitrogensizegrip.cpp | 0 .../{nitrogen => oxygen}/nitrogensizegrip.h | 0 clients/oxygen/oxygenclient.desktop | 29 +++++++++++++++++++ clients/{nitrogen => oxygen}/x11util.cpp | 0 clients/{nitrogen => oxygen}/x11util.h | 0 kcmkwin/kwindecoration/kwindecoration.cpp | 8 ++--- plugins.cpp | 2 +- 42 files changed, 49 insertions(+), 51 deletions(-) delete mode 100644 clients/nitrogen/nitrogenclient.desktop rename clients/{nitrogen => oxygen}/CMakeLists.txt (73%) rename clients/{nitrogen => oxygen}/config/CMakeLists.txt (72%) rename clients/{nitrogen => oxygen}/config/config.cpp (93%) rename clients/{nitrogen => oxygen}/config/config.h (100%) rename clients/{nitrogen => oxygen}/config/itemmodel.cpp (100%) rename clients/{nitrogen => oxygen}/config/itemmodel.h (100%) rename clients/{nitrogen => oxygen}/config/listmodel.h (100%) rename clients/{nitrogen => oxygen}/config/nitrogenconfigurationui.cpp (100%) rename clients/{nitrogen => oxygen}/config/nitrogenconfigurationui.h (100%) rename clients/{nitrogen => oxygen}/config/nitrogendetectwidget.cpp (100%) rename clients/{nitrogen => oxygen}/config/nitrogendetectwidget.h (100%) rename clients/{nitrogen => oxygen}/config/nitrogenexceptiondialog.cpp (100%) rename clients/{nitrogen => oxygen}/config/nitrogenexceptiondialog.h (100%) rename clients/{nitrogen => oxygen}/config/nitrogenexceptionlistwidget.cpp (100%) rename clients/{nitrogen => oxygen}/config/nitrogenexceptionlistwidget.h (100%) rename clients/{nitrogen => oxygen}/config/nitrogenexceptionmodel.cpp (100%) rename clients/{nitrogen => oxygen}/config/nitrogenexceptionmodel.h (100%) rename clients/{nitrogen => oxygen}/config/nitrogenshadowconfigurationui.cpp (100%) rename clients/{nitrogen => oxygen}/config/nitrogenshadowconfigurationui.h (100%) rename clients/{nitrogen => oxygen}/nitrogen.cpp (99%) rename clients/{nitrogen => oxygen}/nitrogen.h (100%) rename clients/{nitrogen => oxygen}/nitrogenbutton.cpp (100%) rename clients/{nitrogen => oxygen}/nitrogenbutton.h (100%) rename clients/{nitrogen => oxygen}/nitrogenclient.cpp (99%) rename clients/{nitrogen => oxygen}/nitrogenclient.h (100%) rename clients/{nitrogen => oxygen}/nitrogenconfiguration.cpp (100%) rename clients/{nitrogen => oxygen}/nitrogenconfiguration.h (100%) rename clients/{nitrogen => oxygen}/nitrogenexception.cpp (100%) rename clients/{nitrogen => oxygen}/nitrogenexception.h (100%) rename clients/{nitrogen => oxygen}/nitrogenexceptionlist.cpp (100%) rename clients/{nitrogen => oxygen}/nitrogenexceptionlist.h (100%) rename clients/{nitrogen => oxygen}/nitrogenshadowconfiguration.cpp (100%) rename clients/{nitrogen => oxygen}/nitrogenshadowconfiguration.h (100%) rename clients/{nitrogen => oxygen}/nitrogensizegrip.cpp (100%) rename clients/{nitrogen => oxygen}/nitrogensizegrip.h (100%) create mode 100644 clients/oxygen/oxygenclient.desktop rename clients/{nitrogen => oxygen}/x11util.cpp (100%) rename clients/{nitrogen => oxygen}/x11util.h (100%) diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt index cacd94c65f..1dc3d48e8a 100644 --- a/clients/CMakeLists.txt +++ b/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 ) diff --git a/clients/nitrogen/nitrogenclient.desktop b/clients/nitrogen/nitrogenclient.desktop deleted file mode 100644 index 27a53e84ad..0000000000 --- a/clients/nitrogen/nitrogenclient.desktop +++ /dev/null @@ -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 diff --git a/clients/nitrogen/CMakeLists.txt b/clients/oxygen/CMakeLists.txt similarity index 73% rename from clients/nitrogen/CMakeLists.txt rename to clients/oxygen/CMakeLists.txt index e30f44e574..9db50de526 100644 --- a/clients/nitrogen/CMakeLists.txt +++ b/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/ ) diff --git a/clients/nitrogen/config/CMakeLists.txt b/clients/oxygen/config/CMakeLists.txt similarity index 72% rename from clients/nitrogen/config/CMakeLists.txt rename to clients/oxygen/config/CMakeLists.txt index 077fd0fe7c..d87d0b4258 100644 --- a/clients/nitrogen/config/CMakeLists.txt +++ b/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} ) diff --git a/clients/nitrogen/config/config.cpp b/clients/oxygen/config/config.cpp similarity index 93% rename from clients/nitrogen/config/config.cpp rename to clients/oxygen/config/config.cpp index 6c6d39cb28..5f03caa0b3 100644 --- a/clients/nitrogen/config/config.cpp +++ b/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(); - - - } + {} } diff --git a/clients/nitrogen/config/config.h b/clients/oxygen/config/config.h similarity index 100% rename from clients/nitrogen/config/config.h rename to clients/oxygen/config/config.h diff --git a/clients/nitrogen/config/itemmodel.cpp b/clients/oxygen/config/itemmodel.cpp similarity index 100% rename from clients/nitrogen/config/itemmodel.cpp rename to clients/oxygen/config/itemmodel.cpp diff --git a/clients/nitrogen/config/itemmodel.h b/clients/oxygen/config/itemmodel.h similarity index 100% rename from clients/nitrogen/config/itemmodel.h rename to clients/oxygen/config/itemmodel.h diff --git a/clients/nitrogen/config/listmodel.h b/clients/oxygen/config/listmodel.h similarity index 100% rename from clients/nitrogen/config/listmodel.h rename to clients/oxygen/config/listmodel.h diff --git a/clients/nitrogen/config/nitrogenconfigurationui.cpp b/clients/oxygen/config/nitrogenconfigurationui.cpp similarity index 100% rename from clients/nitrogen/config/nitrogenconfigurationui.cpp rename to clients/oxygen/config/nitrogenconfigurationui.cpp diff --git a/clients/nitrogen/config/nitrogenconfigurationui.h b/clients/oxygen/config/nitrogenconfigurationui.h similarity index 100% rename from clients/nitrogen/config/nitrogenconfigurationui.h rename to clients/oxygen/config/nitrogenconfigurationui.h diff --git a/clients/nitrogen/config/nitrogendetectwidget.cpp b/clients/oxygen/config/nitrogendetectwidget.cpp similarity index 100% rename from clients/nitrogen/config/nitrogendetectwidget.cpp rename to clients/oxygen/config/nitrogendetectwidget.cpp diff --git a/clients/nitrogen/config/nitrogendetectwidget.h b/clients/oxygen/config/nitrogendetectwidget.h similarity index 100% rename from clients/nitrogen/config/nitrogendetectwidget.h rename to clients/oxygen/config/nitrogendetectwidget.h diff --git a/clients/nitrogen/config/nitrogenexceptiondialog.cpp b/clients/oxygen/config/nitrogenexceptiondialog.cpp similarity index 100% rename from clients/nitrogen/config/nitrogenexceptiondialog.cpp rename to clients/oxygen/config/nitrogenexceptiondialog.cpp diff --git a/clients/nitrogen/config/nitrogenexceptiondialog.h b/clients/oxygen/config/nitrogenexceptiondialog.h similarity index 100% rename from clients/nitrogen/config/nitrogenexceptiondialog.h rename to clients/oxygen/config/nitrogenexceptiondialog.h diff --git a/clients/nitrogen/config/nitrogenexceptionlistwidget.cpp b/clients/oxygen/config/nitrogenexceptionlistwidget.cpp similarity index 100% rename from clients/nitrogen/config/nitrogenexceptionlistwidget.cpp rename to clients/oxygen/config/nitrogenexceptionlistwidget.cpp diff --git a/clients/nitrogen/config/nitrogenexceptionlistwidget.h b/clients/oxygen/config/nitrogenexceptionlistwidget.h similarity index 100% rename from clients/nitrogen/config/nitrogenexceptionlistwidget.h rename to clients/oxygen/config/nitrogenexceptionlistwidget.h diff --git a/clients/nitrogen/config/nitrogenexceptionmodel.cpp b/clients/oxygen/config/nitrogenexceptionmodel.cpp similarity index 100% rename from clients/nitrogen/config/nitrogenexceptionmodel.cpp rename to clients/oxygen/config/nitrogenexceptionmodel.cpp diff --git a/clients/nitrogen/config/nitrogenexceptionmodel.h b/clients/oxygen/config/nitrogenexceptionmodel.h similarity index 100% rename from clients/nitrogen/config/nitrogenexceptionmodel.h rename to clients/oxygen/config/nitrogenexceptionmodel.h diff --git a/clients/nitrogen/config/nitrogenshadowconfigurationui.cpp b/clients/oxygen/config/nitrogenshadowconfigurationui.cpp similarity index 100% rename from clients/nitrogen/config/nitrogenshadowconfigurationui.cpp rename to clients/oxygen/config/nitrogenshadowconfigurationui.cpp diff --git a/clients/nitrogen/config/nitrogenshadowconfigurationui.h b/clients/oxygen/config/nitrogenshadowconfigurationui.h similarity index 100% rename from clients/nitrogen/config/nitrogenshadowconfigurationui.h rename to clients/oxygen/config/nitrogenshadowconfigurationui.h diff --git a/clients/nitrogen/nitrogen.cpp b/clients/oxygen/nitrogen.cpp similarity index 99% rename from clients/nitrogen/nitrogen.cpp rename to clients/oxygen/nitrogen.cpp index 1b7ee6f6bb..f1aeeee791 100644 --- a/clients/nitrogen/nitrogen.cpp +++ b/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() ) ) diff --git a/clients/nitrogen/nitrogen.h b/clients/oxygen/nitrogen.h similarity index 100% rename from clients/nitrogen/nitrogen.h rename to clients/oxygen/nitrogen.h diff --git a/clients/nitrogen/nitrogenbutton.cpp b/clients/oxygen/nitrogenbutton.cpp similarity index 100% rename from clients/nitrogen/nitrogenbutton.cpp rename to clients/oxygen/nitrogenbutton.cpp diff --git a/clients/nitrogen/nitrogenbutton.h b/clients/oxygen/nitrogenbutton.h similarity index 100% rename from clients/nitrogen/nitrogenbutton.h rename to clients/oxygen/nitrogenbutton.h diff --git a/clients/nitrogen/nitrogenclient.cpp b/clients/oxygen/nitrogenclient.cpp similarity index 99% rename from clients/nitrogen/nitrogenclient.cpp rename to clients/oxygen/nitrogenclient.cpp index a0ff5f28fd..adc81a52d9 100644 --- a/clients/nitrogen/nitrogenclient.cpp +++ b/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() diff --git a/clients/nitrogen/nitrogenclient.h b/clients/oxygen/nitrogenclient.h similarity index 100% rename from clients/nitrogen/nitrogenclient.h rename to clients/oxygen/nitrogenclient.h diff --git a/clients/nitrogen/nitrogenconfiguration.cpp b/clients/oxygen/nitrogenconfiguration.cpp similarity index 100% rename from clients/nitrogen/nitrogenconfiguration.cpp rename to clients/oxygen/nitrogenconfiguration.cpp diff --git a/clients/nitrogen/nitrogenconfiguration.h b/clients/oxygen/nitrogenconfiguration.h similarity index 100% rename from clients/nitrogen/nitrogenconfiguration.h rename to clients/oxygen/nitrogenconfiguration.h diff --git a/clients/nitrogen/nitrogenexception.cpp b/clients/oxygen/nitrogenexception.cpp similarity index 100% rename from clients/nitrogen/nitrogenexception.cpp rename to clients/oxygen/nitrogenexception.cpp diff --git a/clients/nitrogen/nitrogenexception.h b/clients/oxygen/nitrogenexception.h similarity index 100% rename from clients/nitrogen/nitrogenexception.h rename to clients/oxygen/nitrogenexception.h diff --git a/clients/nitrogen/nitrogenexceptionlist.cpp b/clients/oxygen/nitrogenexceptionlist.cpp similarity index 100% rename from clients/nitrogen/nitrogenexceptionlist.cpp rename to clients/oxygen/nitrogenexceptionlist.cpp diff --git a/clients/nitrogen/nitrogenexceptionlist.h b/clients/oxygen/nitrogenexceptionlist.h similarity index 100% rename from clients/nitrogen/nitrogenexceptionlist.h rename to clients/oxygen/nitrogenexceptionlist.h diff --git a/clients/nitrogen/nitrogenshadowconfiguration.cpp b/clients/oxygen/nitrogenshadowconfiguration.cpp similarity index 100% rename from clients/nitrogen/nitrogenshadowconfiguration.cpp rename to clients/oxygen/nitrogenshadowconfiguration.cpp diff --git a/clients/nitrogen/nitrogenshadowconfiguration.h b/clients/oxygen/nitrogenshadowconfiguration.h similarity index 100% rename from clients/nitrogen/nitrogenshadowconfiguration.h rename to clients/oxygen/nitrogenshadowconfiguration.h diff --git a/clients/nitrogen/nitrogensizegrip.cpp b/clients/oxygen/nitrogensizegrip.cpp similarity index 100% rename from clients/nitrogen/nitrogensizegrip.cpp rename to clients/oxygen/nitrogensizegrip.cpp diff --git a/clients/nitrogen/nitrogensizegrip.h b/clients/oxygen/nitrogensizegrip.h similarity index 100% rename from clients/nitrogen/nitrogensizegrip.h rename to clients/oxygen/nitrogensizegrip.h diff --git a/clients/oxygen/oxygenclient.desktop b/clients/oxygen/oxygenclient.desktop new file mode 100644 index 0000000000..72c53e467d --- /dev/null +++ b/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 diff --git a/clients/nitrogen/x11util.cpp b/clients/oxygen/x11util.cpp similarity index 100% rename from clients/nitrogen/x11util.cpp rename to clients/oxygen/x11util.cpp diff --git a/clients/nitrogen/x11util.h b/clients/oxygen/x11util.h similarity index 100% rename from clients/nitrogen/x11util.h rename to clients/oxygen/x11util.h diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp index 4f810c41fc..1fe81c629a 100644 --- a/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/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()); diff --git a/plugins.cpp b/plugins.cpp index d2c5b6773e..995f77122e 100644 --- a/plugins.cpp +++ b/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 }