pull/21/head
Timothy Pearson 11 years ago
parent 7c63b8ac46
commit f74503ce1b

@ -63,9 +63,12 @@ process_kcfg( kmail_plugin.cpp globalsettings_base.h kmail
add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/kmail/templatesconfiguration_base.h
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/kmail
COMMAND ${CMAKE_COMMAND}
-DQT_UIC_EXECUTABLE:FILEPATH=${QT_UIC_EXECUTABLE}
-DUIC_EXECUTABLE:FILEPATH=${UIC_EXECUTABLE}
-DTQT_REPLACE_SCRIPT:FILEPATH=${TQT_REPLACE_SCRIPT}
-DTDE_QTPLUGINS_DIR:FILEPATH=${TDE_QTPLUGINS_DIR}
-DUI_FILE:FILEPATH=${CMAKE_SOURCE_DIR}/kmail/templatesconfiguration_base.ui
-DMASTER_SOURCE_DIR:FILEPATH=${CMAKE_SOURCE_DIR}
-DMASTER_BINARY_DIR:FILEPATH=${CMAKE_BINARY_DIR}
-P ${CMAKE_MODULE_PATH}/tde_uic.cmake
DEPENDS
${CMAKE_BINARY_DIR}/kmail/globalsettings_base.h

@ -62,11 +62,11 @@ extern "C"
{
TDEGlobal::locale()->insertCatalogue( "kres_birthday" );
TDEGlobal::locale()->insertCatalogue( "libkcal" );
return new KRES::PluginFactory<ResourceKABC,ResourceKABCConfig>();
return new KRES::PluginFactory<ResourceTDEABC,ResourceTDEABCConfig>();
}
}
ResourceTDEABC::ResourceKABC( const TDEConfig* config )
ResourceTDEABC::ResourceTDEABC( const TDEConfig* config )
: ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ),
mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false )
{
@ -79,14 +79,14 @@ ResourceTDEABC::ResourceKABC( const TDEConfig* config )
init();
}
ResourceTDEABC::ResourceKABC()
ResourceTDEABC::ResourceTDEABC()
: ResourceCalendar( 0 ), mCalendar( TQString::fromLatin1( "UTC" ) ),
mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false )
{
init();
}
ResourceTDEABC::~ResourceKABC()
ResourceTDEABC::~ResourceTDEABC()
{
delete mLock;
}

@ -45,17 +45,17 @@ namespace KCal {
/**
Resource providing birthdays and anniversaries as events.
*/
class KDE_EXPORT ResourceKABC : public ResourceCalendar
class KDE_EXPORT ResourceTDEABC : public ResourceCalendar
{
Q_OBJECT
friend class ResourceKABCConfig;
friend class ResourceTDEABCConfig;
public:
ResourceKABC( const TDEConfig * );
ResourceKABC( );
virtual ~ResourceKABC();
ResourceTDEABC( const TDEConfig * );
ResourceTDEABC( );
virtual ~ResourceTDEABC();
void readConfig( const TDEConfig *config );
void writeConfig( TDEConfig* config );

@ -33,7 +33,7 @@
using namespace KCal;
ResourceKABCConfig::ResourceKABCConfig( TQWidget* parent, const char* name )
ResourceTDEABCConfig::ResourceTDEABCConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
{
TQGridLayout *topLayout = new TQGridLayout( this, 5, 1, 11, 6 );
@ -78,9 +78,9 @@ ResourceKABCConfig::ResourceKABCConfig( TQWidget* parent, const char* name )
new TQCheckListItem( mCategoryView, *it, TQCheckListItem::CheckBox );
}
void ResourceKABCConfig::loadSettings( KRES::Resource *resource )
void ResourceTDEABCConfig::loadSettings( KRES::Resource *resource )
{
ResourceKABC *res = static_cast<ResourceKABC *>( resource );
ResourceTDEABC *res = static_cast<ResourceTDEABC *>( resource );
if ( res ) {
mAlarm->setChecked( res->alarm() );
TQString days;
@ -101,13 +101,13 @@ void ResourceKABCConfig::loadSettings( KRES::Resource *resource )
mUseCategories->setChecked( res->useCategories() );
} else {
kdDebug(5700) << "ERROR: ResourceKABCConfig::loadSettings(): no ResourceKABC, cast failed" << endl;
kdDebug(5700) << "ERROR: ResourceTDEABCConfig::loadSettings(): no ResourceTDEABC, cast failed" << endl;
}
}
void ResourceKABCConfig::saveSettings( KRES::Resource *resource )
void ResourceTDEABCConfig::saveSettings( KRES::Resource *resource )
{
ResourceKABC *res = static_cast<ResourceKABC *>( resource );
ResourceTDEABC *res = static_cast<ResourceTDEABC *>( resource );
if ( res ) {
res->setAlarm( mAlarm->isChecked() );
res->setAlarmDays( mAlarmTimeEdit->text().toInt() );
@ -122,11 +122,11 @@ void ResourceKABCConfig::saveSettings( KRES::Resource *resource )
res->setCategories( categories );
res->setUseCategories( mUseCategories->isChecked() );
} else {
kdDebug(5700) << "ERROR: ResourceKABCConfig::saveSettings(): no ResourceKABC, cast failed" << endl;
kdDebug(5700) << "ERROR: ResourceTDEABCConfig::saveSettings(): no ResourceTDEABC, cast failed" << endl;
}
}
void ResourceKABCConfig::alarmClicked()
void ResourceTDEABCConfig::alarmClicked()
{
mAlarmTimeEdit->setDisabled(!mAlarm->isChecked());
mALabel->setDisabled(!mAlarm->isChecked());

@ -36,14 +36,14 @@ namespace KCal {
/**
Configuration widget for birtday/anniversaries resource.
@see ResourceKABC
@see ResourceTDEABC
*/
class ResourceKABCConfig : public KRES::ConfigWidget
class ResourceTDEABCConfig : public KRES::ConfigWidget
{
Q_OBJECT
public:
ResourceKABCConfig( TQWidget* parent = 0, const char* name = 0 );
ResourceTDEABCConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
virtual void loadSettings( KRES::Resource *resource);

@ -1,7 +1,7 @@
# Code generation options for tdeconfig_compiler
File=prefsskel.kcfg
ClassName=CardDavPrefsSkel
NameSpace=KABC
NameSpace=TDEABC
Singleton=false
Mutators=true
GlobalEnums=true

@ -1,7 +1,7 @@
# Code generation options for tdeconfig_compiler
File=tderesources_tdeabc_egroupware.kcfg
ClassName=EGroupwarePrefs
NameSpace=KABC
NameSpace=TDEABC
Singleton=false
Mutators=true
Inherits=KResourcePrefs

@ -4,5 +4,5 @@ GlobalEnums=true
IncludeFiles=libtdepim/kresourceprefs.h
Inherits=KResourcePrefs
Mutators=true
NameSpace=KABC
NameSpace=TDEABC
Singleton=false

@ -1,7 +1,7 @@
# Code generation options for tdeconfig_compiler
File=tderesources_tdeabc_slox.kcfg
ClassName=SloxPrefs
NameSpace=KABC
NameSpace=TDEABC
Singleton=false
Mutators=true
Inherits=KResourcePrefs

Loading…
Cancel
Save