diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-07 20:26:07 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-07 20:26:07 -0600 |
commit | 43d99cc2477266cb9072e179137f0e8485370b3d (patch) | |
tree | 0d4d47e5497a1a1465edf8263f57b72725577239 /kpersonalizer | |
parent | 6354e6b3babad3ed0f5e314735bbbc01d1988eb2 (diff) | |
download | tdebase-43d99cc2477266cb9072e179137f0e8485370b3d.tar.gz tdebase-43d99cc2477266cb9072e179137f0e8485370b3d.zip |
Rename kwin to twin (part 1 of 2)
Diffstat (limited to 'kpersonalizer')
-rw-r--r-- | kpersonalizer/README | 2 | ||||
-rw-r--r-- | kpersonalizer/keyecandypage.cpp | 234 | ||||
-rw-r--r-- | kpersonalizer/keyecandypage.h | 4 | ||||
-rw-r--r-- | kpersonalizer/kospage.cpp | 6 | ||||
-rw-r--r-- | kpersonalizer/kstylepage.cpp | 90 | ||||
-rw-r--r-- | kpersonalizer/kstylepage.h | 8 |
6 files changed, 172 insertions, 172 deletions
diff --git a/kpersonalizer/README b/kpersonalizer/README index 96224a955..b93d9d15d 100644 --- a/kpersonalizer/README +++ b/kpersonalizer/README @@ -105,7 +105,7 @@ MacOS: - Mac- Keyboard-Scheme - use 2 clipboards for c&p (keyboard/mouse) (default) - Window-Behavior -> Focus on click -- Titlebar doubleclick -> Shade (for now. MacOS X has Minimize but this isn't offered by kwin yet) +- Titlebar doubleclick -> Shade (for now. MacOS X has Minimize but this isn't offered by twin yet) - Menubar on top - WindowList-menu on MMB - Walk trough windows mode: KDE diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp index ca9846cc3..fcc0fde7a 100644 --- a/kpersonalizer/keyecandypage.cpp +++ b/kpersonalizer/keyecandypage.cpp @@ -49,8 +49,8 @@ KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) { - kwinconf = new KConfig("kwinrc", false, true); - kwineventconf = new KConfig("kwin.eventsrc", false, false); + twinconf = new KConfig("twinrc", false, true); + twineventconf = new KConfig("twin.eventsrc", false, false); kickerconf = new KConfig("kickerrc",false, false); konquerorconf = new KConfig("konquerorrc",false, false); konqiconconf = new KConfig("konqiconviewrc",false,false); @@ -131,8 +131,8 @@ KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPag } KEyeCandyPage::~KEyeCandyPage(){ - delete kwinconf; - delete kwineventconf; + delete twinconf; + delete twineventconf; delete kickerconf; delete konquerorconf; delete konqiconconf; @@ -305,17 +305,17 @@ void KEyeCandyPage::enableDesktopWindowEffects(bool enable,bool restore){ // -Animate shade // -Enable Hover //-Enable move/resize on maximised windows - kwinconf->setGroup( "Windows" ); + twinconf->setGroup( "Windows" ); if(!restore){ - kwinconf->writeEntry("AnimateMinimize", enable ); - kwinconf->writeEntry("AnimateShade", enable ); - kwinconf->writeEntry("MoveResizeMaximizedWindows",enable); - kwinconf->writeEntry("ShadeHover", enable ); + twinconf->writeEntry("AnimateMinimize", enable ); + twinconf->writeEntry("AnimateShade", enable ); + twinconf->writeEntry("MoveResizeMaximizedWindows",enable); + twinconf->writeEntry("ShadeHover", enable ); } else { - kwinconf->writeEntry("AnimateMinimize", b_AnimateMinimize ); - kwinconf->writeEntry("AnimateShade", b_AnimateShade ); - kwinconf->writeEntry("MoveResizeMaximizedWindows",b_MoveResizeMaximizedWindows); - kwinconf->writeEntry("ShadeHover", b_ShadeHover); + twinconf->writeEntry("AnimateMinimize", b_AnimateMinimize ); + twinconf->writeEntry("AnimateShade", b_AnimateShade ); + twinconf->writeEntry("MoveResizeMaximizedWindows",b_MoveResizeMaximizedWindows); + twinconf->writeEntry("ShadeHover", b_ShadeHover); } } @@ -326,20 +326,20 @@ void KEyeCandyPage::enableDesktopWindowMovingContents(bool enable, bool restore) // -Display content in resizing window // And KGlobalSettings::opaqueResize() for QSplitters - kwinconf->setGroup( "Windows" ); + twinconf->setGroup( "Windows" ); KGlobal::config()->setGroup("KDE"); if (enable){ - kwinconf->writeEntry("ResizeMode","Opaque"); - kwinconf->writeEntry("MoveMode","Opaque"); + twinconf->writeEntry("ResizeMode","Opaque"); + twinconf->writeEntry("MoveMode","Opaque"); KGlobal::config()->writeEntry("OpaqueResize", true, true, true); } else { - kwinconf->writeEntry("ResizeMode","Transparent"); - kwinconf->writeEntry("MoveMode","Transparent"); + twinconf->writeEntry("ResizeMode","Transparent"); + twinconf->writeEntry("MoveMode","Transparent"); KGlobal::config()->writeEntry("OpaqueResize", false, true, true); } if(restore){ - kwinconf->writeEntry("ResizeMode",s_ResizeMode); - kwinconf->writeEntry("MoveMode",s_MoveMode); + twinconf->writeEntry("ResizeMode",s_ResizeMode); + twinconf->writeEntry("MoveMode",s_MoveMode); KGlobal::config()->writeEntry("OpaqueResize", b_OpaqueResize, true, true); } } @@ -547,49 +547,49 @@ void KEyeCandyPage::enablePreview(bool currSettings){ //----------------------------OTHER STUFF------------------------------------------------- /** Enables the default KDE sound scheme in Level 3 */ void KEyeCandyPage::enableSoundScheme(bool enable, bool user) { - kwineventconf->setGroup("desktop1"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop1 : 0) ); - kwineventconf->setGroup("desktop2"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop2 : 0) ); - kwineventconf->setGroup("desktop3"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop3 : 0) ); - kwineventconf->setGroup("desktop4"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop4 : 0) ); - kwineventconf->setGroup("desktop5"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop5 : 0) ); - kwineventconf->setGroup("desktop6"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop6 : 0) ); - kwineventconf->setGroup("desktop7"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop7 : 0) ); - kwineventconf->setGroup("desktop8"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop8 : 0) ); - - kwineventconf->setGroup("new"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.notold : 0) ); - kwineventconf->setGroup("close"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.close : 0) ); - - kwineventconf->setGroup("transnew"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.transnew : 0) ); - kwineventconf->setGroup("transdelete"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.transdelete : 0) ); - - kwineventconf->setGroup("iconify"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.iconify : 0) ); - kwineventconf->setGroup("deiconify"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.deiconify : 0) ); - kwineventconf->setGroup("maximize"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.maximize : 0) ); - kwineventconf->setGroup("unmaximize"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.unmaximize : 0) ); - kwineventconf->setGroup("shadeup"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.shadeup : 0) ); - kwineventconf->setGroup("shadedown"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.shadedown : 0) ); - kwineventconf->setGroup("sticky"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.sticky : 0) ); - kwineventconf->setGroup("unsticky"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.unsticky : 0) ); + twineventconf->setGroup("desktop1"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop1 : 0) ); + twineventconf->setGroup("desktop2"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop2 : 0) ); + twineventconf->setGroup("desktop3"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop3 : 0) ); + twineventconf->setGroup("desktop4"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop4 : 0) ); + twineventconf->setGroup("desktop5"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop5 : 0) ); + twineventconf->setGroup("desktop6"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop6 : 0) ); + twineventconf->setGroup("desktop7"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop7 : 0) ); + twineventconf->setGroup("desktop8"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop8 : 0) ); + + twineventconf->setGroup("new"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.notold : 0) ); + twineventconf->setGroup("close"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.close : 0) ); + + twineventconf->setGroup("transnew"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.transnew : 0) ); + twineventconf->setGroup("transdelete"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.transdelete : 0) ); + + twineventconf->setGroup("iconify"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.iconify : 0) ); + twineventconf->setGroup("deiconify"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.deiconify : 0) ); + twineventconf->setGroup("maximize"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.maximize : 0) ); + twineventconf->setGroup("unmaximize"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.unmaximize : 0) ); + twineventconf->setGroup("shadeup"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.shadeup : 0) ); + twineventconf->setGroup("shadedown"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.shadedown : 0) ); + twineventconf->setGroup("sticky"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.sticky : 0) ); + twineventconf->setGroup("unsticky"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.unsticky : 0) ); } /** Enable Antialiased fonts. Enable in Level 7. */ @@ -615,16 +615,16 @@ void KEyeCandyPage::save(bool currSettings){ // currSettings==true: save selections. currSettings==false: save user-def. saveCheckState(currSettings); // save all the KConfig-objects to their respective files - kwinconf->sync(); - kwineventconf->sync(); + twinconf->sync(); + twineventconf->sync(); konquerorconf->sync(); konqiconconf->sync(); kickerconf->sync(); kdesktopconf->sync(); KGlobal::config()->sync(); - // restart kwin for window effects + // restart twin for window effects kapp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString("")); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); // set the display options (style effects) KIPC::sendMessageAll(KIPC::SettingsChanged); TQApplication::syncX(); @@ -730,63 +730,63 @@ void KEyeCandyPage::getUserDefaults(){ konq_dont_prev=konqiconconf->readListEntry("DontPreview"); b_konq_prev_sound=konqiconconf->readBoolEntry("EnableSoundPreviews", false); b_konq_prev_enable=konqiconconf->readBoolEntry("PreviewsEnabled", true); - kwinconf->setGroup( "Windows" ); - s_ResizeMode=kwinconf->readEntry("ResizeMode", "Transparent"); - s_MoveMode=kwinconf->readEntry("MoveMode", "Opaque"); + twinconf->setGroup( "Windows" ); + s_ResizeMode=twinconf->readEntry("ResizeMode", "Transparent"); + s_MoveMode=twinconf->readEntry("MoveMode", "Opaque"); - b_AnimateMinimize=kwinconf->readBoolEntry("AnimateMinimize", true ); - b_AnimateShade=kwinconf->readBoolEntry("AnimateShade", true ); - b_MoveResizeMaximizedWindows=kwinconf->readBoolEntry("MoveResizeMaximizedWindows",true); - b_ShadeHover = kwinconf->readBoolEntry("ShadeHover", false); + b_AnimateMinimize=twinconf->readBoolEntry("AnimateMinimize", true ); + b_AnimateShade=twinconf->readBoolEntry("AnimateShade", true ); + b_MoveResizeMaximizedWindows=twinconf->readBoolEntry("MoveResizeMaximizedWindows",true); + b_ShadeHover = twinconf->readBoolEntry("ShadeHover", false); getUserSoundScheme(); } /** gets the users sound-settings */ void KEyeCandyPage::getUserSoundScheme() { - kwineventconf->setGroup("desktop1"); - st_UserSnd.desktop1 = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("desktop2"); - st_UserSnd.desktop2 = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("desktop3"); - st_UserSnd.desktop3 = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("desktop4"); - st_UserSnd.desktop4 = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("desktop5"); - st_UserSnd.desktop5 = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("desktop6"); - st_UserSnd.desktop6 = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("desktop7"); - st_UserSnd.desktop7 = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("desktop8"); - st_UserSnd.desktop8 = kwineventconf->readNumEntry("presentation", 0); - - kwineventconf->setGroup("new"); - st_UserSnd.notold = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("close"); - st_UserSnd.close = kwineventconf->readNumEntry("presentation", 0); - - kwineventconf->setGroup("transnew"); - st_UserSnd.transnew = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("transdelete"); - st_UserSnd.transdelete = kwineventconf->readNumEntry("presentation", 0); - - kwineventconf->setGroup("iconify"); - st_UserSnd.iconify = kwineventconf->readNumEntry("presentation", 0 ); - kwineventconf->setGroup("deiconify"); - st_UserSnd.deiconify = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("maximize"); - st_UserSnd.maximize = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("unmaximize"); - st_UserSnd.unmaximize = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("shadeup"); - st_UserSnd.shadeup = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("shadedown"); - st_UserSnd.shadedown = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("sticky"); - st_UserSnd.sticky = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("unsticky"); - st_UserSnd.unsticky = kwineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop1"); + st_UserSnd.desktop1 = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop2"); + st_UserSnd.desktop2 = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop3"); + st_UserSnd.desktop3 = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop4"); + st_UserSnd.desktop4 = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop5"); + st_UserSnd.desktop5 = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop6"); + st_UserSnd.desktop6 = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop7"); + st_UserSnd.desktop7 = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop8"); + st_UserSnd.desktop8 = twineventconf->readNumEntry("presentation", 0); + + twineventconf->setGroup("new"); + st_UserSnd.notold = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("close"); + st_UserSnd.close = twineventconf->readNumEntry("presentation", 0); + + twineventconf->setGroup("transnew"); + st_UserSnd.transnew = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("transdelete"); + st_UserSnd.transdelete = twineventconf->readNumEntry("presentation", 0); + + twineventconf->setGroup("iconify"); + st_UserSnd.iconify = twineventconf->readNumEntry("presentation", 0 ); + twineventconf->setGroup("deiconify"); + st_UserSnd.deiconify = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("maximize"); + st_UserSnd.maximize = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("unmaximize"); + st_UserSnd.unmaximize = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("shadeup"); + st_UserSnd.shadeup = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("shadedown"); + st_UserSnd.shadedown = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("sticky"); + st_UserSnd.sticky = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("unsticky"); + st_UserSnd.unsticky = twineventconf->readNumEntry("presentation", 0); } /** calls all enable functions with the state of the checkboxes. This is needed for save() only, diff --git a/kpersonalizer/keyecandypage.h b/kpersonalizer/keyecandypage.h index d78fb5110..e817e908d 100644 --- a/kpersonalizer/keyecandypage.h +++ b/kpersonalizer/keyecandypage.h @@ -179,8 +179,8 @@ private: } st_UserSnd; // DEFAULT VALLUES SET BY USER (END) - KConfig* kwinconf; - KConfig* kwineventconf; + KConfig* twinconf; + KConfig* twineventconf; KConfig* kickerconf; KConfig* konquerorconf; KConfig* konqiconconf; diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp index 5dda31ae3..30841aefe 100644 --- a/kpersonalizer/kospage.cpp +++ b/kpersonalizer/kospage.cpp @@ -43,7 +43,7 @@ KOSPage::KOSPage(TQWidget *parent, const char *name ) : KOSPageDlg(parent,name) // Set the configfiles cglobal = new KConfig("kdeglobals"); claunch = new KConfig("klaunchrc", false, false); - cwin = new KConfig("kwinrc"); + cwin = new KConfig("twinrc"); cdesktop = new KConfig("kdesktoprc"); ckcminput = new KConfig("kcminputrc"); ckcmdisplay = new KConfig("kcmdisplayrc"); @@ -92,8 +92,8 @@ void KOSPage::save(bool currSettings){ // Tell kdesktop about the new config file kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray()); /////////////////////////////////////////// - /// restart kwin for window effects - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + /// restart twin for window effects + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); /////////////////////////////////////////// // Make the kaccess daemon read the changed config file diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index d02f9b028..6c9908648 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -78,9 +78,9 @@ KStylePage::KStylePage(TQWidget *parent, const char *name ) : KStylePageDlg(pare connect(klv_styles, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCurrentChanged())); - // Note: if the default is changed here it needs to be changed in kdebase/kwin/plugins.cpp - // and kdebase/kwin/kcmkwin/kwindecoration/kwindecoration.cpp as well. - defaultKWinStyle = TQPixmap::defaultDepth() > 8 ? "kwin_plastik" : "kwin_quartz"; + // Note: if the default is changed here it needs to be changed in kdebase/twin/plugins.cpp + // and kdebase/twin/kcmtwin/twindecoration/twindecoration.cpp as well. + defaultKWinStyle = TQPixmap::defaultDepth() > 8 ? "twin_plastik" : "twin_quartz"; appliedStyle = NULL; getAvailability(); @@ -89,7 +89,7 @@ KStylePage::KStylePage(TQWidget *parent, const char *name ) : KStylePageDlg(pare } KStylePage::~KStylePage(){ - delete ckwin; + delete ctwin; delete appliedStyle; } @@ -115,39 +115,39 @@ void KStylePage::saveStyle(bool curSettings){ /** save the KWin-style*/ void KStylePage::saveKWin(bool curSettings){ - TQString kwin = origKWinStyle; + TQString twin = origKWinStyle; if(curSettings) { KDesktopFile* kdf = 0L; KStandardDirs* kstd = KGlobal::dirs(); - if (cde->isSelected() && kwin_cde_exist) - kdf = new KDesktopFile(kstd->findResource("data", "kwin/cde.desktop")); - else if (win->isSelected() && kwin_win_exist) - kdf = new KDesktopFile(kstd->findResource("data", "kwin/redmond.desktop")); - else if (platinum->isSelected() && kwin_system_exist) - kdf = new KDesktopFile(kstd->findResource("data", "kwin/system.desktop")); - else if (keramik->isSelected() && kwin_keramik_exist) - kdf = new KDesktopFile(kstd->findResource("data", "kwin/keramik.desktop")); + if (cde->isSelected() && twin_cde_exist) + kdf = new KDesktopFile(kstd->findResource("data", "twin/cde.desktop")); + else if (win->isSelected() && twin_win_exist) + kdf = new KDesktopFile(kstd->findResource("data", "twin/redmond.desktop")); + else if (platinum->isSelected() && twin_system_exist) + kdf = new KDesktopFile(kstd->findResource("data", "twin/system.desktop")); + else if (keramik->isSelected() && twin_keramik_exist) + kdf = new KDesktopFile(kstd->findResource("data", "twin/keramik.desktop")); else if (kde->isSelected()) { - if (kwin_plastik_exist && (TQColor::numBitPlanes() > 8)) - kdf = new KDesktopFile(kstd->findResource("data", "kwin/plastik.desktop")); - else if (kwin_quartz_exist) - kdf = new KDesktopFile(kstd->findResource("data", "kwin/quartz.desktop")); + if (twin_plastik_exist && (TQColor::numBitPlanes() > 8)) + kdf = new KDesktopFile(kstd->findResource("data", "twin/plastik.desktop")); + else if (twin_quartz_exist) + kdf = new KDesktopFile(kstd->findResource("data", "twin/quartz.desktop")); } if (kdf) { kdf->setGroup("Desktop Entry"); - kwin = kdf->readEntry("X-KDE-Library", defaultKWinStyle); + twin = kdf->readEntry("X-KDE-Library", defaultKWinStyle); delete kdf; } else { // if we get here classic is selected (there's no .desktop file for the - // kde2 kwin style), or none of the other kwin styles were found. - kwin = "kwin_default"; + // kde2 twin style), or none of the other twin styles were found. + twin = "twin_default"; } } - ckwin->writeEntry("PluginLib", kwin); - ckwin->sync(); - kdDebug() << "KStylePage::saveKWin(): " << kwin << endl; + ctwin->writeEntry("PluginLib", twin); + ctwin->sync(); + kdDebug() << "KStylePage::saveKWin(): " << twin << endl; } /** Save the color-scheme */ @@ -411,7 +411,7 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){ delete config; } -/** Test widget- and kwin- styles for availability */ +/** Test widget- and twin- styles for availability */ void KStylePage::getAvailability() { // test, wich styles are available kde_keramik_exist = kde_hc_exist = kde_def_exist = cde_exist @@ -436,23 +436,23 @@ void KStylePage::getAvailability() { if (!platinum_exist) platinum->tqsetVisible(false); // test, wich KWin-styles are available - kwin_keramik_exist = kwin_system_exist = kwin_plastik_exist - = kwin_default_exist = kwin_win_exist - = kwin_cde_exist = kwin_quartz_exist = false; + twin_keramik_exist = twin_system_exist = twin_plastik_exist + = twin_default_exist = twin_win_exist + = twin_cde_exist = twin_quartz_exist = false; KStandardDirs* kstd = KGlobal::dirs(); - if (!kstd->findResource("data", "kwin/keramik.desktop").isNull()) - kwin_keramik_exist = true; - if (!kstd->findResource("data", "kwin/plastik.desktop").isNull()) - kwin_plastik_exist = true; - if (!kstd->findResource("data", "kwin/system.desktop").isNull()) - kwin_system_exist = true; - if (!kstd->findResource("data", "kwin/redmond.desktop").isNull()) - kwin_win_exist = true; - if (!kstd->findResource("data", "kwin/cde.desktop").isNull()) - kwin_cde_exist = true; - if (!kstd->findResource("data", "kwin/quartz.desktop").isNull()) - kwin_quartz_exist = true; - kwin_default_exist = true; // we can't check for a .desktop-file for the old default because there is none + if (!kstd->findResource("data", "twin/keramik.desktop").isNull()) + twin_keramik_exist = true; + if (!kstd->findResource("data", "twin/plastik.desktop").isNull()) + twin_plastik_exist = true; + if (!kstd->findResource("data", "twin/system.desktop").isNull()) + twin_system_exist = true; + if (!kstd->findResource("data", "twin/redmond.desktop").isNull()) + twin_win_exist = true; + if (!kstd->findResource("data", "twin/cde.desktop").isNull()) + twin_cde_exist = true; + if (!kstd->findResource("data", "twin/quartz.desktop").isNull()) + twin_quartz_exist = true; + twin_default_exist = true; // we can't check for a .desktop-file for the old default because there is none // check, wich Icon-themes are available icon_crystalsvg_exist = icon_kdeclassic_exist = icon_Locolor_exist = false; @@ -473,9 +473,9 @@ void KStylePage::getUserDefaults() { origStyle = KGlobal::config()->readEntry( "widgetStyle", KStyle::defaultStyle() ); // get the user's current KWin-style - ckwin = new KConfig("kwinrc"); - ckwin->setGroup("Style"); - origKWinStyle = ckwin->readEntry("PluginLib", defaultKWinStyle); + ctwin = new KConfig("twinrc"); + ctwin->setGroup("Style"); + origKWinStyle = ctwin->readEntry("PluginLib", defaultKWinStyle); // get the users current colors getColors(&usrColors, false); @@ -521,8 +521,8 @@ void KStylePage::liveUpdate() { KIPC::sendMessageAll(KIPC::StyleChanged); // color palette changes KIPC::sendMessageAll(KIPC::PaletteChanged); - // kwin-style - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + // twin-style + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); // kdesktop-background kapp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString("")); } diff --git a/kpersonalizer/kstylepage.h b/kpersonalizer/kstylepage.h index f215e7e8d..a82168768 100644 --- a/kpersonalizer/kstylepage.h +++ b/kpersonalizer/kstylepage.h @@ -44,7 +44,7 @@ private: TQString origIcons; TQString defaultKWinStyle; TQString currentStyle; - KConfig* ckwin; + KConfig* ctwin; struct colorSet { TQString colorFile, bgMode; int contrast; @@ -96,9 +96,9 @@ private: bool kde_hc_exist, kde_def_exist, kde_keramik_exist, kde_light_exist, cde_exist, win_exist, platinum_exist, kde_plastik_exist; - // kwin-style-existence - bool kwin_keramik_exist, kwin_default_exist, kwin_system_exist, - kwin_win_exist, kwin_cde_exist, kwin_quartz_exist, kwin_plastik_exist; + // twin-style-existence + bool twin_keramik_exist, twin_default_exist, twin_system_exist, + twin_win_exist, twin_cde_exist, twin_quartz_exist, twin_plastik_exist; // icon-theme-existence bool icon_crystalsvg_exist, icon_kdeclassic_exist, icon_Locolor_exist; |