diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeL10n.txt | 8 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | src/Makefile.am | 16 | ||||
| -rw-r--r-- | src/kdmtheme.desktop | 31 | ||||
| -rw-r--r-- | src/tdmtheme.cpp (renamed from src/kdmtheme.cpp) | 128 | ||||
| -rw-r--r-- | src/tdmtheme.desktop | 18 | ||||
| -rw-r--r-- | src/tdmtheme.h (renamed from src/kdmtheme.h) | 18 |
7 files changed, 132 insertions, 119 deletions
diff --git a/src/CMakeL10n.txt b/src/CMakeL10n.txt new file mode 100644 index 0000000..a217759 --- /dev/null +++ b/src/CMakeL10n.txt @@ -0,0 +1,8 @@ +##### create translation templates ############## + +tde_l10n_create_template( "messages/tdmtheme" ) + +tde_l10n_create_template( + CATALOG "desktop_files/tdmtheme.desktop/" + SOURCES tdmtheme.desktop +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..b77500c --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,32 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kcm_tdmtheme (kpart) + +tde_add_kpart( kcm_tdmtheme AUTOMOC + + SOURCES + tdmtheme.cpp + LINK + tdeio-shared + tdeui-shared + tdecore-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( ${PROJECT_NAME}.desktop ) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 94379de..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDES = $(all_includes) -METASOURCES = AUTO - -# Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = kcm_kdmtheme.la - -kcm_kdmtheme_la_SOURCES = kdmtheme.cpp -kcm_kdmtheme_la_LIBADD = -lkio -lknewstuff $(LIB_KDEUI) -kcm_kdmtheme_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) - - -xdg_apps_DATA = kdmtheme.desktop - - -messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kcmkdmtheme.pot diff --git a/src/kdmtheme.desktop b/src/kdmtheme.desktop deleted file mode 100644 index 1459fb3..0000000 --- a/src/kdmtheme.desktop +++ /dev/null @@ -1,31 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=kcmshell kdmtheme -Icon=kdmconfig -Type=Application - -X-KDE-ModuleType=Library -X-KDE-Library=kdmtheme -X-KDE-RootOnly=true -X-KDE-HasReadOnlyMode=true -X-KDE-ParentApp=kcontrol -X-Keywords=kdmtheme - -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 テーママネージャー - -Categories=Qt;KDE;X-KDE-settings-system;X-KDE-systemsettings-lookandfeel-appearance; diff --git a/src/kdmtheme.cpp b/src/tdmtheme.cpp index cf9fdf3..df3b89e 100644 --- a/src/kdmtheme.cpp +++ b/src/tdmtheme.cpp @@ -18,20 +18,20 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "kdmtheme.h" +#include "tdmtheme.h" #include <kdialog.h> -#include <kglobal.h> -#include <kio/job.h> -#include <kio/netaccess.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprogress.h> #include <kstandarddirs.h> #include <ktar.h> #include <kurlrequester.h> #include <kurlrequesterdlg.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <tqcheckbox.h> #include <tqdir.h> @@ -57,11 +57,11 @@ class ThemeData : public TQListViewItem { TQString description; }; -typedef KGenericFactory<KDMThemeWidget, TQWidget> kdmthemeFactory; -K_EXPORT_COMPONENT_FACTORY( kcm_kdmtheme, kdmthemeFactory("kcmkdmtheme")) +typedef KGenericFactory<TDMThemeWidget, TQWidget> tdmthemeFactory; +K_EXPORT_COMPONENT_FACTORY( kcm_tdmtheme, tdmthemeFactory("kcmtdmtheme")) -KDMThemeWidget::KDMThemeWidget( TQWidget *parent, const char *name, const TQStringList& ) - : KCModule(parent, name), config( 0L ) +TDMThemeWidget::TDMThemeWidget( TQWidget *parent, const char *name, const TQStringList& ) + : TDECModule(parent, name), config( 0L ) { TQGridLayout *ml = new TQGridLayout( this ); ml->setSpacing( KDialog::spacingHint() ); @@ -73,7 +73,7 @@ KDMThemeWidget::KDMThemeWidget( TQWidget *parent, const char *name, const TQStri sakWarning->hide(); 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 ); @@ -90,7 +90,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,13 +111,13 @@ KDMThemeWidget::KDMThemeWidget( TQWidget *parent, const char *name, const TQStri ml->addWidget( bRemoveTheme, 4, 1 ); - connect( themeWidget, TQT_SIGNAL(selectionChanged()), TQT_SLOT(themeSelected()) ); - connect( bInstallTheme, TQT_SIGNAL(clicked()), TQT_SLOT(installNewTheme()) ); - connect( bRemoveTheme, TQT_SIGNAL(clicked()), TQT_SLOT(removeSelectedThemes()) ); - connect( cUseTheme, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleUseTheme( bool ) ) ); + connect( themeWidget, TQ_SIGNAL(selectionChanged()), TQ_SLOT(themeSelected()) ); + connect( bInstallTheme, TQ_SIGNAL(clicked()), TQ_SLOT(installNewTheme()) ); + connect( bRemoveTheme, TQ_SIGNAL(clicked()), TQ_SLOT(removeSelectedThemes()) ); + connect( cUseTheme, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( toggleUseTheme( bool ) ) ); - TQStringList themeDirs = KGlobal::dirs()->findDirs("data","kdm/"); - themeDir = KGlobal::dirs()->findDirs("data","kdm/").last(); + TQStringList themeDirs = TDEGlobal::dirs()->findDirs("data","tdm/"); + themeDir = TDEGlobal::dirs()->findDirs("data","tdm/").last(); TQDir d; for ( TQStringList::Iterator dirs = themeDirs.begin(); dirs != themeDirs.end(); ++dirs ) { kdDebug() << "Loading themes... ( " + *dirs + "themes/" + " )" << endl; @@ -132,13 +132,13 @@ KDMThemeWidget::KDMThemeWidget( TQWidget *parent, const char *name, const TQStri load(); - if (getuid() != 0) { + if (getuid() != 0 || !config->checkConfigFilesWritable( true )) { cUseTheme->setEnabled( false ); - setReadOnly(false); + setReadOnly(true); } } -void KDMThemeWidget::selectTheme( const TQString &path ) +void TDMThemeWidget::selectTheme( const TQString &path ) { for ( TQListViewItemIterator tdi( themeWidget ); tdi.current(); tdi++ ) { ThemeData * td = ((ThemeData *)*tdi); @@ -150,28 +150,28 @@ void KDMThemeWidget::selectTheme( const TQString &path ) } } -void KDMThemeWidget::load() +void TDMThemeWidget::load() { - TQString kdmrc = KGlobal::dirs()->findResource("config", "kdm/kdmdistrc"); - if ( kdmrc.isEmpty() ) { - kdmrc = KGlobal::dirs()->findResource("config", "kdm/kdmrc"); + TQString tdmrc = TDEGlobal::dirs()->findResource("config", "tdm/tdmdistrc"); + if ( tdmrc.isEmpty() ) { + tdmrc = TDEGlobal::dirs()->findResource("config", "tdm/tdmrc"); } - if ( kdmrc.isEmpty() ) { - kdError() << "Failed to find kdm resource file kdmrc!" << endl; + 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 TDEConfig( tdmrc ); config->setGroup( "X-*-Greeter" ); - bool sakEnabled = config->readBoolEntry( "UseSAK", true ); + bool sakEnabled = config->readBoolEntry( "UseSAK", false ); if (sakEnabled) { // FIXME // Integrate KDE_BINDIR with Autotools and use this line instead of the one below it... @@ -200,7 +200,7 @@ void KDMThemeWidget::load() } } -void KDMThemeWidget::save() +void TDMThemeWidget::save() { kdDebug() << "Saving: Theme " << defaultTheme->path << " - UseTheme " << cUseTheme->isChecked() << endl; config->writeEntry( "Theme", defaultTheme->path ); @@ -208,19 +208,19 @@ 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) { if (!cUseTheme->isEnabled()) { ro = true; @@ -230,18 +230,18 @@ void KDMThemeWidget::setReadOnly(bool ro) bRemoveTheme->setEnabled( ro ); } -void KDMThemeWidget::insertTheme( const TQString &_theme ) +void TDMThemeWidget::insertTheme( const TQString &_theme ) { - KConfig * themeConfig; + TDEConfig * themeConfig; TQString name; kdDebug() << "Looking for " << _theme << "/KdmGreeterTheme.desktop" << endl; - themeConfig = new KConfig( _theme + "/KdmGreeterTheme.desktop"); + themeConfig = new TDEConfig( _theme + "/KdmGreeterTheme.desktop"); themeConfig->setGroup( "GdmGreeterTheme" ); name = themeConfig->readEntry( "Name" ); if (name.isEmpty()) { kdDebug() << "Looking for " << _theme << "/GdmGreeterTheme.desktop" << endl; - themeConfig = new KConfig( _theme + "/GdmGreeterTheme.desktop"); + themeConfig = new TDEConfig( _theme + "/GdmGreeterTheme.desktop"); themeConfig->setGroup( "GdmGreeterTheme" ); name = themeConfig->readEntry( "Name" ); @@ -266,16 +266,18 @@ void KDMThemeWidget::insertTheme( const TQString &_theme ) child->description = themeConfig->readEntry( "Description" ); } -void KDMThemeWidget::updateInfoView( ThemeData *theme ) +void TDMThemeWidget::updateInfoView( ThemeData *theme ) { if(theme) { info->setText( - ((theme->copyright.length() > 0) ? - i18n("<qt><strong>Copyright:</strong> %1<br/></qt>", - theme->copyright) : "") + - ((theme->description.length() > 0) ? - i18n("<qt><strong>Description:</strong> %1</qt>", - theme->description) : "") ); + ((theme->copyright.length() > 0) + ? i18n("<qt><strong>Copyright:</strong> %1<br/></qt>") + .arg(theme->copyright) + : "") + + ((theme->description.length() > 0) + ? i18n("<qt><strong>Description:</strong> %1</qt>") + .arg(theme->description) + : "") ); preview->setPixmap( theme->path + '/' + theme->screenShot ); preview->setText( theme->screenShot.isEmpty() ? i18n("Screenshot not available") : TQString() ); @@ -286,9 +288,9 @@ void KDMThemeWidget::updateInfoView( ThemeData *theme ) } } -void KDMThemeWidget::installNewTheme() +void TDMThemeWidget::installNewTheme() { - KURLRequesterDlg fileRequester( TQString(), this, i18n("Drag or Type Theme URL") ); + KURLRequesterDlg fileRequester( TQString(), this, i18n("Drag or Type Theme URL").utf8() ); fileRequester.urlRequester()->setMode( KFile::File | KFile::Directory | KFile::ExistingOnly ); KURL themeURL = fileRequester.getURL(); if (themeURL.isEmpty()) @@ -296,18 +298,18 @@ void KDMThemeWidget::installNewTheme() TQString themeTmpFile; - if (!KIO::NetAccess::download( themeURL, themeTmpFile, this )) { + if (!TDEIO::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.").arg(themeURL.prettyURL()); else - sorryText = i18n("Unable to download the KDM theme archive;\n" - "please check that address %1 is correct.",themeURL.prettyURL()); + sorryText = i18n("Unable to download the TDM theme archive;\n" + "please check that address %1 is correct.").arg(themeURL.prettyURL()); KMessageBox::sorry( this, sorryText ); return; } - TQList<KArchiveDirectory> foundThemes; + TQPtrList<KArchiveDirectory> foundThemes; KTar archive( themeTmpFile ); archive.open( IO_ReadOnly ); @@ -327,10 +329,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").utf8(), TQString() ); progressDiag.setModal( true ); progressDiag.setAutoClose( true ); progressDiag.progressBar()->setTotalSteps( foundThemes.count() ); @@ -338,7 +340,7 @@ void KDMThemeWidget::installNewTheme() for ( KArchiveDirectory * ard = foundThemes.first(); foundThemes.current(); foundThemes.next() ) { progressDiag.setLabel( - i18n("<qt>Installing <strong>%1</strong> theme</qt>", ard->name() ) ); + i18n("<qt>Installing <strong>%1</strong> theme</qt>").arg(ard->name()) ); TQString path = themeDir + "themes/" + ard->name(); kdDebug() << "Unpacking new theme to " << path << endl; @@ -355,10 +357,10 @@ void KDMThemeWidget::installNewTheme() archive.close(); - KIO::NetAccess::removeTempFile( themeTmpFile ); + TDEIO::NetAccess::removeTempFile( themeTmpFile ); } -void KDMThemeWidget::themeSelected() +void TDMThemeWidget::themeSelected() { if (themeWidget->selectedItem()) { defaultTheme = (ThemeData *)(themeWidget->selectedItem()); @@ -368,18 +370,18 @@ 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 + TDEIO::del( ((ThemeData *)themes)->path ); // XXX error check themeWidget->takeItem( themes ); } -#include "kdmtheme.moc" +#include "tdmtheme.moc" diff --git a/src/tdmtheme.desktop b/src/tdmtheme.desktop new file mode 100644 index 0000000..c17e347 --- /dev/null +++ b/src/tdmtheme.desktop @@ -0,0 +1,18 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=tdecmshell tdmtheme +Icon=tdmconfig +Type=Application + +X-TDE-ModuleType=Library +X-TDE-Library=tdmtheme +X-TDE-RootOnly=true +X-TDE-HasReadOnlyMode=true +X-TDE-ParentApp=kcontrol +X-Keywords=tdmtheme; + +Comment=tdmtheme - TDM Theme Manager +Name=TDM Theme Manager + +Categories=Qt;TDE;X-TDE-settings-system;X-TDE-systemsettings-lookandfeel-appearance; +X-DocPath=tdmtheme/index.html diff --git a/src/kdmtheme.h b/src/tdmtheme.h index d649c83..c41fc5e 100644 --- a/src/kdmtheme.h +++ b/src/tdmtheme.h @@ -18,11 +18,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef _KDMTHEME_H_ -#define _KDMTHEME_H_ +#ifndef _TDMTHEME_H_ +#define _TDMTHEME_H_ -#include <kconfig.h> -#include <kcmodule.h> +#include <tdeconfig.h> +#include <tdecmodule.h> #include <tqwidget.h> @@ -33,12 +33,12 @@ class TQPushButton; class TQListView; class TQCheckBox; -class KDMThemeWidget : public KCModule { - Q_OBJECT - TQ_OBJECT +class TDMThemeWidget : public TDECModule { + 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(); @@ -60,7 +60,7 @@ class KDMThemeWidget : public KCModule { ThemeData *defaultTheme; TQString themeDir; - KConfig *config; + TDEConfig *config; protected slots: void themeSelected(); |