diff --git a/ChangeLog b/ChangeLog
index 758c38c..f48f4ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,7 +20,7 @@
Thanks Laurent!!
2005-03-23 (0.5): Theme adding now possible! (code borrowed from kcmicon)
- Known limitation currently is if you don't have a $TDEDIR/share/apps/kdm/themes/
+ Known limitation currently is if you don't have a $TDEDIR/share/apps/tdm/themes/
then the install will fail the first time but will be successful the 2nd time.
2005-03-23 (0.6): Applied another patch from Laurent to fix a potential memory leak.
@@ -32,7 +32,7 @@
Display Description
If a theme's source directory no longer exists remove it from out list.
-2005-03-24 (0.7): Use KDM icon.
+2005-03-24 (0.7): Use TDM icon.
Moved to System Administration section.
Updated Documentation.
Fixed layout issues.
@@ -61,7 +61,7 @@
2005-07-19 (0.9.1): Updated the UI (added a bar, autosized the listbox columns and top aligned the details)
Fixed a bug where the Insert Url box and Button were not being disabled when loaded as non-root.
Updated /admin to kde's in 3.4.1 (fixes the problem with --prefix not defaulting to kde's installed dir.)
- Attempt at fixing the "cannot find kdmrc file" error.
+ Attempt at fixing the "cannot find tdmrc file" error.
2005-12-29 (0.9.2): Disable widgets when UseTheme is set to false.
When loading make sure a thumbnail is displayed, if one exists.
@@ -74,7 +74,7 @@
2006-01-30 (1.0.1): When inserting a theme configChanged() was not run.
2006-02-23 (1.1): Applied a patch from Jonathan Patrick Davies to fix an i18n/l10n issue.
- Removed Themes Variable in the kdmrc (kdm devs didn't like it :) The problem with removing this however is you can now no longer "insert" themes, instead they all must be your $TDEDIR/share/kdm/themes dir. If you have always used kdmtheme to install themes and not insert them, you'll not need to worry. This will also mean that your list can now never be lost! (unless of course you lose your themes directory.) Also being that this list is now auto generated if you remove a theme be sure to check "remove from hard drive" if you don't want it to show up again on the next load.
+ Removed Themes Variable in the tdmrc (tdm devs didn't like it :) The problem with removing this however is you can now no longer "insert" themes, instead they all must be your $TDEDIR/share/tdm/themes dir. If you have always used tdmtheme to install themes and not insert them, you'll not need to worry. This will also mean that your list can now never be lost! (unless of course you lose your themes directory.) Also being that this list is now auto generated if you remove a theme be sure to check "remove from hard drive" if you don't want it to show up again on the next load.
Updated address for the GPL license to match that found in KDE.
2006-06-20 (1.1.1): Fixed 2 crashes 1 where no themes were found in your theme directory
@@ -88,7 +88,7 @@
Fixed removing of themes from the list to a less hack-ish way.
Few i18n fixes
2006-08-12 (1.1.3): Added Indonesian/Manaysian translation to the .desktop (thanks kucrut!)
- Finally applied a patch sent to me back when 1.1 was released, which fixes an issue when the kdmrc file could not be found. To the one who sent me this patch Sorry it took me so long, patch got lost in all my files and didn't apply cleanly due to the massive changes in 1.0.1 -> 1.1
+ Finally applied a patch sent to me back when 1.1 was released, which fixes an issue when the tdmrc file could not be found. To the one who sent me this patch Sorry it took me so long, patch got lost in all my files and didn't apply cleanly due to the massive changes in 1.0.1 -> 1.1
Added French, Italian and Japanese translations to the .desktop (thanks Lorenzo La Spada!)
Fixed a typo which caused an error message to be printed when it shouldn't have.
Updated documentation.
diff --git a/configure.in b/configure.in
index 406a8ba..f5e1364 100644
--- a/configure.in
+++ b/configure.in
@@ -40,7 +40,7 @@ dnl Perform program name transformation
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kdmtheme, 0.1) dnl searches for some needed programs
+AM_INIT_AUTOMAKE(tdmtheme, 0.1) dnl searches for some needed programs
KDE_SET_PREFIX
diff --git a/configure.in.in b/configure.in.in
index dea2368..9c6192f 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,5 +1,5 @@
#MIN_CONFIG(3.0.0)
-AM_INIT_AUTOMAKE(kdmtheme, 0.1)
+AM_INIT_AUTOMAKE(tdmtheme, 0.1)
AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 12b6acb..a8dd1c1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,5 +2,5 @@
# in this directory they are installed into the english dir
KDE_LANG = en
-KDE_DOCS = kdmtheme
+KDE_DOCS = tdmtheme
SUBDIRS = $(AUTODIRS)
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
index 98b1da6..b52b075 100644
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -1,2 +1,2 @@
-KDE_DOCS = kdmtheme
+KDE_DOCS = tdmtheme
KDE_LANG = en
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index dc02f7d..851593d 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -1,7 +1,7 @@
kdmtheme 1.1.3">
-
+ tdmtheme 1.1.3">
+
@@ -44,7 +44,7 @@ thanks ;-).
as Authors, publish date, the abstract, and Keywords -->
-The &kdmtheme; Handbook
+The &tdmtheme; Handbook
@@ -83,7 +83,7 @@ Do NOT change these in the translation. -->
-&kdmtheme; is K Control Center Module designed to easily configure your KDM themes.
+&tdmtheme; is K Control Center Module designed to easily configure your TDM themes.
@@ -93,9 +93,9 @@ Please at least include KDE, the KDE package it is in, the name
KDE
-kdmtheme
-KDM
-KDM Theme Manager
+tdmtheme
+TDM
+TDM Theme Manager
@@ -118,12 +118,12 @@ problems. Basically a long version of the abstract. Don't include a
revision history. (see installation appendix comment) -->
-&kdmtheme; is a K Control Module designed to easily configure your KDM themes. Please report problems either on kde-look/kde-apps or email smileaf@smileaf.org
+&tdmtheme; is a K Control Module designed to easily configure your TDM themes. Please report problems either on kde-look/kde-apps or email smileaf@smileaf.org
-
-Using &kdmtheme;
+
+Using &tdmtheme;
patent issues. -->
-Here's a screenshot of &kdmtheme;
+Here's a screenshot of &tdmtheme;
-
+
Screenshot
@@ -187,7 +187,7 @@ application work. -->
My buttons are disabled!
- Is the "Enable KDM Themes" check box checked?
+ Is the "Enable TDM Themes" check box checked?
@@ -195,7 +195,7 @@ application work. -->
I don't see any themes what's wrong?!
- First make sure you didn't 'insert' any themes those are not saved only themes that appear in your theme directory are used. Next check your theme directory it should be located in your $TDEDIR/share/apps/kdm/themes/
+ First make sure you didn't 'insert' any themes those are not saved only themes that appear in your theme directory are used. Next check your theme directory it should be located in your $TDEDIR/share/apps/tdm/themes/
@@ -211,7 +211,7 @@ distribution. -->
Credits and License
-&kdmtheme;
+&tdmtheme;
Program copyright %{YEAR} Stephen Leaf smileaf@smileaf.org
@@ -258,11 +258,11 @@ Documentation copyright %{YEAR} Stephen Leaf smileaf@smileaf.org
Installation
-
-How to obtain &kdmtheme;
+
+How to obtain &tdmtheme;
-&kdmtheme; is in most major distributions. Should yours not have a package please visit: The project page
+&tdmtheme; is in most major distributions. Should yours not have a package please visit: The project page
@@ -281,14 +281,14 @@ information here.
-->
-In order to successfully use &kdmtheme;, you need &kde; >=3.4
+In order to successfully use &tdmtheme;, you need &kde; >=3.4
-You can find a list of changes at The &kdmtheme; project page.
+You can find a list of changes at The &tdmtheme; project page.
diff --git a/src/Makefile.am b/src/Makefile.am
index ef8cbb8..e8afd19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,15 +2,15 @@ INCLUDES = $(all_includes)
METASOURCES = AUTO
# Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = kcm_kdmtheme.la
+kde_module_LTLIBRARIES = kcm_tdmtheme.la
-kcm_kdmtheme_la_SOURCES = kdmtheme.cpp
-kcm_kdmtheme_la_LIBADD = -lkio -lknewstuff $(LIB_TDEUI)
-kcm_kdmtheme_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
+kcm_tdmtheme_la_SOURCES = tdmtheme.cpp
+kcm_tdmtheme_la_LIBADD = -lkio -lknewstuff $(LIB_TDEUI)
+kcm_tdmtheme_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
-xdg_apps_DATA = kdmtheme.desktop
+xdg_apps_DATA = tdmtheme.desktop
messages: rc.cpp
- $(XGETTEXT) *.cpp -o $(podir)/kcmkdmtheme.pot
+ $(XGETTEXT) *.cpp -o $(podir)/kcmtdmtheme.pot
diff --git a/src/kdmtheme.cpp b/src/kdmtheme.cpp
index 9cb57df..a4da499 100644
--- a/src/kdmtheme.cpp
+++ b/src/kdmtheme.cpp
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "kdmtheme.h"
+#include "tdmtheme.h"
#include
#include
@@ -57,10 +57,10 @@ class ThemeData : public TQListViewItem {
TQString description;
};
-typedef KGenericFactory kdmthemeFactory;
-K_EXPORT_COMPONENT_FACTORY( kcm_kdmtheme, kdmthemeFactory("kcmkdmtheme"))
+typedef KGenericFactory tdmthemeFactory;
+K_EXPORT_COMPONENT_FACTORY( kcm_tdmtheme, tdmthemeFactory("kcmtdmtheme"))
-KDMThemeWidget::KDMThemeWidget( TQWidget *parent, const char *name, const TQStringList& )
+TDMThemeWidget::TDMThemeWidget( TQWidget *parent, const char *name, const TQStringList& )
: KCModule(parent, name), config( 0L )
{
TQGridLayout *ml = new TQGridLayout( this );
@@ -68,7 +68,7 @@ KDMThemeWidget::KDMThemeWidget( TQWidget *parent, const char *name, const TQStri
ml->setMargin( KDialog::marginHint() );
cUseTheme = new TQCheckBox( this );
- cUseTheme->setText( i18n( "En&able KDM Themes" ) );
+ cUseTheme->setText( i18n( "En&able TDM Themes" ) );
ml->addMultiCellWidget( cUseTheme, 0, 0, 0, 2 );
themeWidget = new TQListView( this );
@@ -85,7 +85,7 @@ KDMThemeWidget::KDMThemeWidget( TQWidget *parent, const char *name, const TQStri
preview = new TQLabel( this );
preview->setFixedSize( TQSize( 200, 150 ) );
preview->setScaledContents( true );
- TQWhatsThis::add(preview, i18n("This is a screen shot of what KDM will look like.") );
+ TQWhatsThis::add(preview, i18n("This is a screen shot of what TDM will look like.") );
ml->addWidget( preview, 1, 2 );
@@ -111,8 +111,8 @@ KDMThemeWidget::KDMThemeWidget( TQWidget *parent, const char *name, const TQStri
connect( bRemoveTheme, TQT_SIGNAL(clicked()), TQT_SLOT(removeSelectedThemes()) );
connect( cUseTheme, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleUseTheme( bool ) ) );
- TQStringList themeDirs = KGlobal::dirs()->findDirs("data","kdm/");
- themeDir = KGlobal::dirs()->findDirs("data","kdm/").last();
+ TQStringList themeDirs = KGlobal::dirs()->findDirs("data","tdm/");
+ themeDir = KGlobal::dirs()->findDirs("data","tdm/").last();
TQDir d;
for ( TQStringList::Iterator dirs = themeDirs.begin(); dirs != themeDirs.end(); ++dirs ) {
kdDebug() << "Loading themes... ( " + *dirs + "themes/" + " )" << endl;
@@ -133,7 +133,7 @@ KDMThemeWidget::KDMThemeWidget( TQWidget *parent, const char *name, const TQStri
}
}
-void KDMThemeWidget::selectTheme( const TQString &path )
+void TDMThemeWidget::selectTheme( const TQString &path )
{
for ( TQListViewItemIterator tdi( themeWidget ); tdi.current(); tdi++ ) {
ThemeData * td = ((ThemeData *)*tdi);
@@ -145,22 +145,22 @@ void KDMThemeWidget::selectTheme( const TQString &path )
}
}
-void KDMThemeWidget::load()
+void TDMThemeWidget::load()
{
- TQString kdmrc = KGlobal::dirs()->findResource("config", "kdm/kdmrc");
- if ( kdmrc.isEmpty() ) {
- kdError() << "Failed to find kdm resource file kdmrc!" << endl;
+ TQString tdmrc = KGlobal::dirs()->findResource("config", "tdm/tdmrc");
+ if ( tdmrc.isEmpty() ) {
+ kdError() << "Failed to find tdm resource file tdmrc!" << endl;
KMessageBox msgBox;
- msgBox.sorry(0, i18n("I can't find the configuration file for the Login Manager, kdm. Check you have set up the Login Manager from the Control Center, and that you have permision to read and write the Login Manager's configuration file.\n\n You must set-up the Login Manager before you can use its themes."), i18n("Can't find Configuration File"));
+ msgBox.sorry(0, i18n("I can't find the configuration file for the Login Manager, tdm. Check you have set up the Login Manager from the Control Center, and that you have permision to read and write the Login Manager's configuration file.\n\n You must set-up the Login Manager before you can use its themes."), i18n("Can't find Configuration File"));
delete config;
config = NULL;
} else {
- kdDebug() << "Loading... ( " + kdmrc + " )" << endl;
+ kdDebug() << "Loading... ( " + tdmrc + " )" << endl;
delete config;
- config = new KConfig( kdmrc );
+ config = new KConfig( tdmrc );
config->setGroup( "X-*-Greeter" );
cUseTheme->setChecked( config->readBoolEntry( "UseTheme", false ) );
@@ -168,7 +168,7 @@ void KDMThemeWidget::load()
}
}
-void KDMThemeWidget::save()
+void TDMThemeWidget::save()
{
kdDebug() << "Saving: Theme " << defaultTheme->path << " - UseTheme " << cUseTheme->isChecked() << endl;
config->writeEntry( "Theme", defaultTheme->path );
@@ -176,26 +176,26 @@ void KDMThemeWidget::save()
config->sync();
}
-void KDMThemeWidget::defaults()
+void TDMThemeWidget::defaults()
{
selectTheme( themeDir + "circles" );
emit changed(true);
}
-void KDMThemeWidget::toggleUseTheme(bool useTheme) {
+void TDMThemeWidget::toggleUseTheme(bool useTheme) {
setReadOnly( useTheme );
emit changed(true);
}
-void KDMThemeWidget::setReadOnly(bool ro)
+void TDMThemeWidget::setReadOnly(bool ro)
{
themeWidget->setEnabled( ro );
bInstallTheme->setEnabled( ro );
bRemoveTheme->setEnabled( ro );
}
-void KDMThemeWidget::insertTheme( const TQString &_theme )
+void TDMThemeWidget::insertTheme( const TQString &_theme )
{
KConfig * themeConfig;
TQString name;
@@ -231,7 +231,7 @@ void KDMThemeWidget::insertTheme( const TQString &_theme )
child->description = themeConfig->readEntry( "Description" );
}
-void KDMThemeWidget::updateInfoView( ThemeData *theme )
+void TDMThemeWidget::updateInfoView( ThemeData *theme )
{
info->setText(
((theme->copyright.length() > 0) ?
@@ -245,7 +245,7 @@ void KDMThemeWidget::updateInfoView( ThemeData *theme )
"Screenshot not available" : TQString() );
}
-void KDMThemeWidget::installNewTheme()
+void TDMThemeWidget::installNewTheme()
{
KURLRequesterDlg fileRequester( TQString(), this, i18n("Drag or Type Theme URL") );
fileRequester.urlRequester()->setMode( KFile::File | KFile::Directory | KFile::ExistingOnly );
@@ -258,9 +258,9 @@ void KDMThemeWidget::installNewTheme()
if (!KIO::NetAccess::download( themeURL, themeTmpFile, this )) {
TQString sorryText;
if (themeURL.isLocalFile())
- sorryText = i18n("Unable to find the KDM theme archive %1.",themeURL.prettyURL());
+ sorryText = i18n("Unable to find the TDM theme archive %1.",themeURL.prettyURL());
else
- sorryText = i18n("Unable to download the KDM theme archive;\n"
+ sorryText = i18n("Unable to download the TDM theme archive;\n"
"please check that address %1 is correct.",themeURL.prettyURL());
KMessageBox::sorry( this, sorryText );
return;
@@ -286,10 +286,10 @@ void KDMThemeWidget::installNewTheme()
}
if (foundThemes.isEmpty())
- KMessageBox::error( this, i18n("The file is not a valid KDM theme archive.") );
+ KMessageBox::error( this, i18n("The file is not a valid TDM theme archive.") );
else {
KProgressDialog progressDiag( this,
- i18n("Installing KDM themes"), TQString() );
+ i18n("Installing TDM themes"), TQString() );
progressDiag.setModal( true );
progressDiag.setAutoClose( true );
progressDiag.progressBar()->setTotalSteps( foundThemes.count() );
@@ -317,7 +317,7 @@ void KDMThemeWidget::installNewTheme()
KIO::NetAccess::removeTempFile( themeTmpFile );
}
-void KDMThemeWidget::themeSelected()
+void TDMThemeWidget::themeSelected()
{
if (themeWidget->selectedItem()) {
defaultTheme = (ThemeData *)(themeWidget->selectedItem());
@@ -327,13 +327,13 @@ void KDMThemeWidget::themeSelected()
emit changed(true);
}
-void KDMThemeWidget::removeSelectedThemes()
+void TDMThemeWidget::removeSelectedThemes()
{
TQListViewItem * themes = themeWidget->selectedItem();
if (!themes)
return;
if (KMessageBox::questionYesNoList( this,
- i18n("Are you sure you want to remove this KDM theme?"),
+ i18n("Are you sure you want to remove this TDM theme?"),
themes->text(0), i18n("Remove theme?") ) != KMessageBox::Yes)
return;
KIO::del( ((ThemeData *)themes)->path ); // XXX error check
@@ -341,4 +341,4 @@ void KDMThemeWidget::removeSelectedThemes()
themeWidget->takeItem( themes );
}
-#include "kdmtheme.moc"
+#include "tdmtheme.moc"
diff --git a/src/kdmtheme.desktop b/src/kdmtheme.desktop
index 1459fb3..31e6349 100644
--- a/src/kdmtheme.desktop
+++ b/src/kdmtheme.desktop
@@ -1,31 +1,31 @@
[Desktop Entry]
Encoding=UTF-8
-Exec=kcmshell kdmtheme
-Icon=kdmconfig
+Exec=kcmshell tdmtheme
+Icon=tdmconfig
Type=Application
X-KDE-ModuleType=Library
-X-KDE-Library=kdmtheme
+X-KDE-Library=tdmtheme
X-KDE-RootOnly=true
X-KDE-HasReadOnlyMode=true
X-KDE-ParentApp=kcontrol
-X-Keywords=kdmtheme
+X-Keywords=tdmtheme
-Comment=kdmtheme - KDM Theme Manager
-Comment[es]=kdmtheme - Manejador del tema de KDM
-Comment[sv]=kdmtheme - Temahanterare för KDM
-Comment[id]=kdmtheme - Pengatur Tema KDM
-Comment[ms]=kdmtheme - Pengatur Tema KDM
-Comment[fr]=kdmtheme - Gestionnaire de thèmes KDM
-Comment[it]=kdmtheme - Gestore di temi KDM
-Comment[jp]=kdmtheme - KDM テーママネージャー
-Name=KDM Theme Manager
-Name[es]=Manejador del tema de KDM
-Name[sv]=Temahanterare för KDM
-Name[id]=Pengatur Tema KDM
-Name[ms]=Pengatur Tema KDM
-Name[fr]=Gestionnaire de thèmes KDM
-Name[it]=Gestore di temi KDM
-Name[jp]=KDM テーママネージャー
+Comment=tdmtheme - TDM Theme Manager
+Comment[es]=tdmtheme - Manejador del tema de TDM
+Comment[sv]=tdmtheme - Temahanterare för TDM
+Comment[id]=tdmtheme - Pengatur Tema TDM
+Comment[ms]=tdmtheme - Pengatur Tema TDM
+Comment[fr]=tdmtheme - Gestionnaire de thèmes TDM
+Comment[it]=tdmtheme - Gestore di temi TDM
+Comment[jp]=tdmtheme - TDM テーママネージャー
+Name=TDM Theme Manager
+Name[es]=Manejador del tema de TDM
+Name[sv]=Temahanterare för TDM
+Name[id]=Pengatur Tema TDM
+Name[ms]=Pengatur Tema TDM
+Name[fr]=Gestionnaire de thèmes TDM
+Name[it]=Gestore di temi TDM
+Name[jp]=TDM テーママネージャー
Categories=Qt;KDE;X-KDE-settings-system;X-KDE-systemsettings-lookandfeel-appearance;
diff --git a/src/kdmtheme.h b/src/kdmtheme.h
index 5371cab..3013157 100644
--- a/src/kdmtheme.h
+++ b/src/kdmtheme.h
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#ifndef _KDMTHEME_H_
-#define _KDMTHEME_H_
+#ifndef _TDMTHEME_H_
+#define _TDMTHEME_H_
#include
#include
@@ -33,12 +33,12 @@ class TQPushButton;
class TQListView;
class TQCheckBox;
-class KDMThemeWidget : public KCModule {
+class TDMThemeWidget : public KCModule {
Q_OBJECT
TQ_OBJECT
public:
- KDMThemeWidget( TQWidget *parent = 0, const char *name=0, const TQStringList& = TQStringList() );
+ TDMThemeWidget( TQWidget *parent = 0, const char *name=0, const TQStringList& = TQStringList() );
virtual void load();
virtual void save();