summaryrefslogtreecommitdiffstats
path: root/kwin-styles/icewm
diff options
context:
space:
mode:
Diffstat (limited to 'kwin-styles/icewm')
-rw-r--r--kwin-styles/icewm/CMakeLists.txt6
-rw-r--r--kwin-styles/icewm/Makefile.am10
-rw-r--r--kwin-styles/icewm/config/CMakeLists.txt4
-rw-r--r--kwin-styles/icewm/config/Makefile.am10
-rw-r--r--kwin-styles/icewm/config/config.cpp22
-rw-r--r--kwin-styles/icewm/icewm-themes/CMakeLists.txt2
-rw-r--r--kwin-styles/icewm/icewm-themes/Makefile.am2
-rw-r--r--kwin-styles/icewm/icewm-themes/default.theme6
-rw-r--r--kwin-styles/icewm/icewm.cpp30
-rw-r--r--kwin-styles/icewm/icewm.desktop2
10 files changed, 47 insertions, 47 deletions
diff --git a/kwin-styles/icewm/CMakeLists.txt b/kwin-styles/icewm/CMakeLists.txt
index a156cb68..d59f42c9 100644
--- a/kwin-styles/icewm/CMakeLists.txt
+++ b/kwin-styles/icewm/CMakeLists.txt
@@ -24,11 +24,11 @@ link_directories(
##### other data ################################
-install( FILES icewm.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES icewm.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
-##### kwin3_icewm ###############################
+##### twin3_icewm ###############################
-tde_add_kpart( kwin3_icewm AUTOMOC
+tde_add_kpart( twin3_icewm AUTOMOC
SOURCES icewm.cpp
LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/icewm/Makefile.am b/kwin-styles/icewm/Makefile.am
index 25d4e613..e067c531 100644
--- a/kwin-styles/icewm/Makefile.am
+++ b/kwin-styles/icewm/Makefile.am
@@ -2,16 +2,16 @@ INCLUDES = $(all_includes)
SUBDIRS = . config icewm-themes
-kde_module_LTLIBRARIES = kwin3_icewm.la
+kde_module_LTLIBRARIES = twin3_icewm.la
-kwin3_icewm_la_SOURCES = icewm.cpp
-kwin3_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin3_icewm_la_LIBADD = $(LIB_TDEUI) -ltdecorations
+twin3_icewm_la_SOURCES = icewm.cpp
+twin3_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin3_icewm_la_LIBADD = $(LIB_TDEUI) -ltdecorations
METASOURCES = AUTO
noinst_HEADERS = icewm.h
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
lnk_DATA = icewm.desktop
EXTRA_DIST = $(lnk_DATA)
diff --git a/kwin-styles/icewm/config/CMakeLists.txt b/kwin-styles/icewm/config/CMakeLists.txt
index f13613d0..9e2e118d 100644
--- a/kwin-styles/icewm/config/CMakeLists.txt
+++ b/kwin-styles/icewm/config/CMakeLists.txt
@@ -19,9 +19,9 @@ link_directories(
${TQT_LIBRARY_DIRS}
)
-##### kwin_icewm_config (module) ################
+##### twin_icewm_config (module) ################
-tde_add_kpart( kwin_icewm_config AUTOMOC
+tde_add_kpart( twin_icewm_config AUTOMOC
SOURCES config.cpp
LINK tdeui-shared kio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/icewm/config/Makefile.am b/kwin-styles/icewm/config/Makefile.am
index 5e026009..ca2d2552 100644
--- a/kwin-styles/icewm/config/Makefile.am
+++ b/kwin-styles/icewm/config/Makefile.am
@@ -1,15 +1,15 @@
INCLUDES = $(all_includes)
-kde_module_LTLIBRARIES = kwin_icewm_config.la
+kde_module_LTLIBRARIES = twin_icewm_config.la
-kwin_icewm_config_la_SOURCES = config.cpp
-kwin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin_icewm_config_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
+twin_icewm_config_la_SOURCES = config.cpp
+twin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_icewm_config_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
METASOURCES = AUTO
noinst_HEADERS = config.h
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
###KMAKE-start (don't edit or delete this block)
diff --git a/kwin-styles/icewm/config/config.cpp b/kwin-styles/icewm/config/config.cpp
index 8b679d54..a0a2a8db 100644
--- a/kwin-styles/icewm/config/config.cpp
+++ b/kwin-styles/icewm/config/config.cpp
@@ -48,18 +48,18 @@ extern "C"
// NOTE:
// ==========================================================================
-// 'conf' is a pointer to the kwindecoration modules open kwin config,
+// 'conf' is a pointer to the twindecoration modules open twin config,
// and is by default set to the "Style" group.
//
// 'parent' is the parent of the TQObject, which is a VBox inside the
-// Configure tab in kwindecoration
+// Configure tab in twindecoration
// ==========================================================================
IceWMConfig::IceWMConfig( KConfig* conf, TQWidget* parent )
: TQObject( parent )
{
- icewmConfig = new KConfig("kwinicewmrc");
- KGlobal::locale()->insertCatalogue("kwin_art_clients");
+ icewmConfig = new KConfig("twinicewmrc");
+ KGlobal::locale()->insertCatalogue("twin_art_clients");
mainWidget = new TQVBox( parent );
mainWidget->setSpacing( KDialog::spacingHint() );
@@ -123,7 +123,7 @@ IceWMConfig::IceWMConfig( KConfig* conf, TQWidget* parent )
this, TQT_SLOT(slotSelectionChanged()) );
// Create the theme directory (if not found) ... and obtain the path as we do so.
- localThemeString = KGlobal::dirs()->saveLocation("data", "kwin");
+ localThemeString = KGlobal::dirs()->saveLocation("data", "twin");
localThemeString += "/icewm-themes";
if (!TQFile::exists(localThemeString))
TQDir().mkdir(localThemeString);
@@ -139,7 +139,7 @@ IceWMConfig::IceWMConfig( KConfig* conf, TQWidget* parent )
urlThemeString.replace( TQRegExp("~"), "$HOME" );
urlLabel->setURL( urlThemeString );
- // Make the widgets visible in kwindecoration
+ // Make the widgets visible in twindecoration
mainWidget->show();
KDirWatch::self()->startScan();
@@ -158,14 +158,14 @@ IceWMConfig::~IceWMConfig()
// Searches for all installed IceWM themes, and adds them to the listBox.
void IceWMConfig::findIceWMThemes()
{
- TQStringList dirList = KGlobal::dirs()->findDirs("data", "kwin/icewm-themes");
+ TQStringList dirList = KGlobal::dirs()->findDirs("data", "twin/icewm-themes");
TQStringList::ConstIterator it;
// Remove any old themes in the list (if any)
themeListBox->clear();
themeListBox->insertItem( i18n("Infadel #2 (default)") );
- // Step through all kwin/icewm-themes directories...
+ // Step through all twin/icewm-themes directories...
for( it = dirList.begin(); it != dirList.end(); it++)
{
// List all directory names only...
@@ -175,7 +175,7 @@ void IceWMConfig::findIceWMThemes()
TQFileInfoListIterator it2( *d.entryInfoList() );
TQFileInfo* finfo;
- // Step through all directories within the kwin/icewm-themes directory
+ // Step through all directories within the twin/icewm-themes directory
while( (finfo = it2.current()) )
{
// Ignore . and .. directories
@@ -223,7 +223,7 @@ void IceWMConfig::slotSelectionChanged()
}
-// Loads the configurable options from the kwinicewmrc config file
+// Loads the configurable options from the twinicewmrc config file
void IceWMConfig::load( KConfig* )
{
icewmConfig->setGroup("General");
@@ -241,7 +241,7 @@ void IceWMConfig::load( KConfig* )
}
-// Saves the configurable options to the kwinicewmrc config file
+// Saves the configurable options to the twinicewmrc config file
void IceWMConfig::save( KConfig* )
{
icewmConfig->setGroup("General");
diff --git a/kwin-styles/icewm/icewm-themes/CMakeLists.txt b/kwin-styles/icewm/icewm-themes/CMakeLists.txt
index 8a029357..367553ab 100644
--- a/kwin-styles/icewm/icewm-themes/CMakeLists.txt
+++ b/kwin-styles/icewm/icewm-themes/CMakeLists.txt
@@ -18,4 +18,4 @@ install( FILES
minimizeA.xpm minimizeI.xpm restoreA.xpm restoreI.xpm
rolldownA.xpm rolldownI.xpm rollupA.xpm rollupI.xpm
default.theme
- DESTINATION ${DATA_INSTALL_DIR}/kwin/icewm-themes )
+ DESTINATION ${DATA_INSTALL_DIR}/twin/icewm-themes )
diff --git a/kwin-styles/icewm/icewm-themes/Makefile.am b/kwin-styles/icewm/icewm-themes/Makefile.am
index 40290635..dcd5463a 100644
--- a/kwin-styles/icewm/icewm-themes/Makefile.am
+++ b/kwin-styles/icewm/icewm-themes/Makefile.am
@@ -7,6 +7,6 @@ pics_DATA = titleAB.xpm titleAJ.xpm titleAM.xpm titleAP.xpm titleAQ.xpm \
rolldownA.xpm rolldownI.xpm rollupA.xpm rollupI.xpm \
default.theme
-picsdir = $(kde_datadir)/kwin/icewm-themes
+picsdir = $(kde_datadir)/twin/icewm-themes
diff --git a/kwin-styles/icewm/icewm-themes/default.theme b/kwin-styles/icewm/icewm-themes/default.theme
index 5c76117b..945a3824 100644
--- a/kwin-styles/icewm/icewm-themes/default.theme
+++ b/kwin-styles/icewm/icewm-themes/default.theme
@@ -19,12 +19,12 @@
# PLEASE NOTE:
# ============
-# Heavily modified by gallium for the purposes of kwin-icewm.
+# Heavily modified by gallium for the purposes of twin-icewm.
# Please do not use this for icewm. Use the original icewm Infadel #2 instead.
-# The full Infadel #2 theme will still work with kwin-icewm as well, but
+# The full Infadel #2 theme will still work with twin-icewm as well, but
# this trimmed version is included here for space reasons.
-ThemeDescription="Infadel/1.0.7(kwin)"
+ThemeDescription="Infadel/1.0.7(twin)"
ThemeAuthor="xerithane@nerdfarm.org"
Look=pixmap
diff --git a/kwin-styles/icewm/icewm.cpp b/kwin-styles/icewm/icewm.cpp
index 47386962..4b9a064b 100644
--- a/kwin-styles/icewm/icewm.cpp
+++ b/kwin-styles/icewm/icewm.cpp
@@ -120,7 +120,7 @@ bool validframe = false;
bool useActiveShadow = false;
bool useInActiveShadow = false;
-// KControl Settings - Read from kwinicewmrc config file or icewm theme
+// KControl Settings - Read from twinicewmrc config file or icewm theme
bool themeTitleTextColors = true; // Allow theme to set colors.
// kcontrol will have no effect
@@ -147,7 +147,7 @@ bool validPixmaps( TQPixmap* p[] )
// ThemeHandler class
//
// This class allows us to free dynamic memory upon being reset, or unloaded
-// from kwin, so we don't leak big images everywhere, and handles the theme
+// from twin, so we don't leak big images everywhere, and handles the theme
// initialisation / destruction in general.
////////////////////////////////////////////////////////////////////////////////////////////
@@ -234,10 +234,10 @@ TQString ThemeHandler::reverseString( TQString s )
}
-// This function reads the kwinicewmrc config file
+// This function reads the twinicewmrc config file
void ThemeHandler::readConfig()
{
- KConfig conf("kwinicewmrc");
+ KConfig conf("twinicewmrc");
conf.setGroup("General");
themeName = conf.readEntry("CurrentTheme");
themeTitleTextColors = conf.readBoolEntry("ThemeTitleTextColors", true);
@@ -271,7 +271,7 @@ void ThemeHandler::initTheme()
// We use kconfig to read icewm config files...
// this is easy since icewm uses key=value pairs!
- KConfig config( locate("data", TQString("kwin/icewm-themes/") +
+ KConfig config( locate("data", TQString("twin/icewm-themes/") +
themeName + TQString("default.theme")) );
// Load specifics, or use IceWM defaults instead.
@@ -496,7 +496,7 @@ void ThemeHandler::freePixmapGroup( TQPixmap* p[] )
p[Active] = NULL;
p[InActive] = NULL;
} else
- qWarning("kwin-icewm: freePixmapGroup - invalid TQPixmap** 'p'\n");
+ qWarning("twin-icewm: freePixmapGroup - invalid TQPixmap** 'p'\n");
}
@@ -583,9 +583,9 @@ static void draw3DRect(TQPainter &pnt, TQColor &col, int x, int y, int w, int h,
void ThemeHandler::setPixmapButton( TQPixmap* p[], TQString s1, TQString s2)
{
if ( p[Active] )
- qWarning("kwin-icewm: setPixmap - should be null (1)\n");
+ qWarning("twin-icewm: setPixmap - should be null (1)\n");
if ( p[InActive] )
- qWarning("kwin-icewm: setPixmap - should be null (2)\n");
+ qWarning("twin-icewm: setPixmap - should be null (2)\n");
TQString str = locate("appdata", TQString("icewm-themes/")
+ themeName + s1 + "A" + s2);
@@ -682,13 +682,13 @@ void ThemeHandler::setPixmap( TQPixmap* p[], TQString s1, TQString s2,
bool stretch, bool stretchHoriz )
{
if ( p[Active] )
- qWarning("kwin-icewm: setPixmap - should be null (1)\n");
+ qWarning("twin-icewm: setPixmap - should be null (1)\n");
if ( p[InActive] )
- qWarning("kwin-icewm: setPixmap - should be null (2)\n");
+ qWarning("twin-icewm: setPixmap - should be null (2)\n");
- p[Active] = new TQPixmap( locate("data", TQString("kwin/icewm-themes/")
+ p[Active] = new TQPixmap( locate("data", TQString("twin/icewm-themes/")
+ themeName + s1 + "A" + s2) );
- p[InActive] = new TQPixmap( locate("data", TQString("kwin/icewm-themes/")
+ p[InActive] = new TQPixmap( locate("data", TQString("twin/icewm-themes/")
+ themeName + s1 + "I" + s2) );
// Stretch the pixmap if requested.
@@ -726,7 +726,7 @@ bool ThemeHandler::isFrameValid()
}
-// Resets the theme, and re-clients all kwin's wrapped windows.
+// Resets the theme, and re-clients all twin's wrapped windows.
bool ThemeHandler::reset( unsigned long)
{
initialized = false;
@@ -825,7 +825,7 @@ void IceWMButton::drawButton(TQPainter *pnt)
pnt->drawPixmap(0, 0, *p, 0, 0, width, titleBarHeight);
}
} else
- qWarning("kwin-icewm: Can't paint a null pixmap button");
+ qWarning("twin-icewm: Can't paint a null pixmap button");
}
@@ -1028,7 +1028,7 @@ void IceWMClient::addClientButtons( const TQString& s )
break; */
case 'r':
- // NOTE: kwin doesn't have toggleShade() in clients.h !
+ // NOTE: twin doesn't have toggleShade() in clients.h !
if ( validPixmaps(rollupPix) && !button[BtnRollup] )
{
button[BtnRollup] = new IceWMButton(this, "shade",
diff --git a/kwin-styles/icewm/icewm.desktop b/kwin-styles/icewm/icewm.desktop
index 387caa0c..eeffdcc0 100644
--- a/kwin-styles/icewm/icewm.desktop
+++ b/kwin-styles/icewm/icewm.desktop
@@ -8,4 +8,4 @@ Name[th]=ตัวจัดการหน้าต่าง IceWM
Name[vi]=Nước đá WM
Name[xh]=UmkhenkceWM
Name[zu]=Iqhwa leWM
-X-KDE-Library=kwin3_icewm
+X-KDE-Library=twin3_icewm