wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move tag to mailcommon needed by addtagdialog box

Browse Source
wilder-work
Montel Laurent 13 years ago
parent 12030a9e6e
commit 2b3c1817c3
6 changed files with 34 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      CMakeLists.txt
  2. 37
      configuredialog.cpp
  3. 10
      configuredialog_p.h
  4. 8
      tagactionmanager.cpp
  5. 4
      tagactionmanager.h
  6. 8
      tagselectdialog.cpp

8
CMakeLists.txt
Unescape View File

@ -107,7 +107,6 @@ if (NOT WINCE AND KDEPIM_BUILD_DESKTOP)
attachmentview.cpp
archivefolderdialog.cpp
searchdescriptionattribute.cpp
tag.cpp
tagactionmanager.cpp
foldershortcutactionmanager.cpp
addressvalidationjob.cpp
@ -123,13 +122,6 @@ if (NOT WINCE AND KDEPIM_BUILD_DESKTOP)
attachmentmissingwarning.cpp
)
soprano_add_ontology(kmailprivate_LIB_SRCS
${CMAKE_SOURCE_DIR}/messagecore/messagetag.trig
"MessageTag"
"Vocabulary"
"trig"
)
# TODO PORT
qt4_generate_dbus_interface(kmcomposewin.h org.kde.kmail.mailcomposer.xml OPTIONS -a)
qt4_add_dbus_adaptor(kmailprivate_LIB_SRCS

37
configuredialog.cpp
Unescape View File

@ -42,7 +42,6 @@
#include "folderrequester.h"
#include "kmmainwidget.h"
#include "composer.h"
#include "tag.h"
#include "accountconfigorderdialog.h"
#include "util.h"
@ -77,6 +76,8 @@ using KPIM::RecentAddresses;
#include "templateparser/globalsettings_base.h"
#include "mailcommon/mailutil.h"
#include "mailcommon/tagwidget.h"
#include "mailcommon/tag.h"
#include "messagecomposer/messagecomposersettings.h"
#include <soprano/nao.h>
@ -1667,12 +1668,12 @@ TagListWidgetItem::~TagListWidgetItem()
{
}
void TagListWidgetItem::setKMailTag( const KMail::Tag::Ptr& tag )
void TagListWidgetItem::setKMailTag( const MailCommon::Tag::Ptr& tag )
{
mTag = tag;
}
KMail::Tag::Ptr TagListWidgetItem::kmailTag() const
MailCommon::Tag::Ptr TagListWidgetItem::kmailTag() const
{
return mTag;
}
@ -1881,7 +1882,7 @@ void AppearancePage::MessageTagTab::slotRecordTagSettings( int aIndex )
QListWidgetItem *item = mTagListBox->item( aIndex );
TagListWidgetItem *tagItem = static_cast<TagListWidgetItem*>( item );
KMail::Tag::Ptr tmp_desc = tagItem->kmailTag();
MailCommon::Tag::Ptr tmp_desc = tagItem->kmailTag();
tmp_desc->tagName = tagItem->text();
@ -1920,7 +1921,7 @@ void AppearancePage::MessageTagTab::slotUpdateTagSettingWidgets( int aIndex )
mTagDownButton->setEnabled(( ( int( mTagListBox->count() ) - 1 ) != aIndex ) );
QListWidgetItem * item = mTagListBox->currentItem();
TagListWidgetItem *tagItem = static_cast<TagListWidgetItem*>( item );
KMail::Tag::Ptr tmp_desc = tagItem->kmailTag();
MailCommon::Tag::Ptr tmp_desc = tagItem->kmailTag();
mTagRemoveButton->setEnabled( !tmp_desc->tagStatus );
@ -1965,7 +1966,7 @@ void AppearancePage::MessageTagTab::slotRemoveTag()
if ( tmp_index >= 0 ) {
QListWidgetItem * item = mTagListBox->takeItem( mTagListBox->currentRow() );
TagListWidgetItem *tagItem = static_cast<TagListWidgetItem*>( item );
KMail::Tag::Ptr tmp_desc = tagItem->kmailTag();
MailCommon::Tag::Ptr tmp_desc = tagItem->kmailTag();
Nepomuk2::Tag nepomukTag( tmp_desc->nepomukResourceUri );
nepomukTag.remove();
mPreviousTag = -1;
@ -2043,7 +2044,7 @@ void AppearancePage::MessageTagTab::slotAddNewTag()
Nepomuk2::Tag nepomukTag( newTagName );
nepomukTag.setLabel( newTagName );
KMail::Tag::Ptr tag = KMail::Tag::fromNepomuk( nepomukTag );
MailCommon::Tag::Ptr tag = MailCommon::Tag::fromNepomuk( nepomukTag );
tag->priority = tmp_priority;
slotEmitChangeCheck();
TagListWidgetItem *newItem = new TagListWidgetItem( KIcon( tag->iconName ), newTagName, mTagListBox );
@ -2059,15 +2060,15 @@ void AppearancePage::MessageTagTab::doLoadFromGlobalSettings()
return;
mTagListBox->clear();
QList<KMail::TagPtr> msgTagList;
QList<MailCommon::TagPtr> msgTagList;
foreach( const Nepomuk2::Tag &nepomukTag, Nepomuk2::Tag::allTags() ) {
KMail::Tag::Ptr tag = KMail::Tag::fromNepomuk( nepomukTag );
MailCommon::Tag::Ptr tag = MailCommon::Tag::fromNepomuk( nepomukTag );
msgTagList.append( tag );
}
qSort( msgTagList.begin(), msgTagList.end(), KMail::Tag::compare );
qSort( msgTagList.begin(), msgTagList.end(), MailCommon::Tag::compare );
foreach( const KMail::Tag::Ptr& tag, msgTagList ) {
foreach( const MailCommon::Tag::Ptr& tag, msgTagList ) {
TagListWidgetItem *newItem = new TagListWidgetItem( KIcon( tag->iconName ), tag->tagName, mTagListBox );
newItem->setKMailTag( tag );
if ( tag->priority == -1 )
@ -2087,8 +2088,8 @@ void AppearancePage::MessageTagTab::doLoadFromGlobalSettings()
// Save the original list
mOriginalMsgTagList.clear();
foreach( const KMail::TagPtr &tag, msgTagList ) {
mOriginalMsgTagList.append( KMail::TagPtr( new KMail::Tag( *tag ) ) );
foreach( const MailCommon::TagPtr &tag, msgTagList ) {
mOriginalMsgTagList.append( MailCommon::TagPtr( new MailCommon::Tag( *tag ) ) );
}
}
@ -2118,16 +2119,16 @@ void AppearancePage::MessageTagTab::save()
const int numberOfMsgTagList = count;
for ( int i=0; i < numberOfMsgTagList; ++i ) {
if ( ( i>=mOriginalMsgTagList.count() ) || *(tagItem->kmailTag()) != *(mOriginalMsgTagList[i]) ) {
KMail::Tag::Ptr tag = tagItem->kmailTag();
MailCommon::Tag::Ptr tag = tagItem->kmailTag();
tag->priority = i;
KMail::Tag::SaveFlags saveFlags = 0;
MailCommon::Tag::SaveFlags saveFlags = 0;
if ( mTagWidget->textColorCheck()->isChecked() )
saveFlags |= KMail::Tag::TextColor;
saveFlags |= MailCommon::Tag::TextColor;
if ( mTagWidget->backgroundColorCheck()->isChecked() )
saveFlags |= KMail::Tag::BackgroundColor;
saveFlags |= MailCommon::Tag::BackgroundColor;
if ( mTagWidget->textFontCheck()->isChecked() )
saveFlags |= KMail::Tag::Font;
saveFlags |= MailCommon::Tag::Font;
tag->saveToNepomuk( saveFlags );
}
}

10
configuredialog_p.h
Unescape View File

@ -78,7 +78,7 @@ namespace TemplateParser {
class TemplatesConfiguration;
}
namespace KMail {
namespace MailCommon {
class Tag;
typedef QSharedPointer<Tag> TagPtr;
}
@ -397,10 +397,10 @@ public:
explicit TagListWidgetItem( const QIcon & icon, const QString & text, QListWidget * parent = 0);
~TagListWidgetItem();
void setKMailTag( const KMail::Tag::Ptr& tag );
KMail::Tag::Ptr kmailTag() const;
void setKMailTag( const MailCommon::Tag::Ptr& tag );
MailCommon::Tag::Ptr kmailTag() const;
private:
KMail::Tag::Ptr mTag;
MailCommon::Tag::Ptr mTag;
};
/**Configuration tab in the appearance page for modifying the available set of
@ -475,7 +475,7 @@ private: // data
MailCommon::TagWidget *mTagWidget;
// So we can compare to mMsgTagList and see if the user changed tags
QList<KMail::TagPtr> mOriginalMsgTagList;
QList<MailCommon::TagPtr> mOriginalMsgTagList;
/*Used to safely call slotRecordTagSettings when the selection in
list box changes*/

8
tagactionmanager.cpp
Unescape View File

@ -109,7 +109,7 @@ void TagActionManager::clearActions()
mMessageTagToggleMapper = 0;
}
void TagActionManager::createTagAction( const Tag::Ptr &tag, bool addToMenu )
void TagActionManager::createTagAction( const MailCommon::Tag::Ptr &tag, bool addToMenu )
{
QString cleanName( i18n("Message Tag %1", tag->tagName ) );
cleanName.replace('&',"&&");
@ -165,7 +165,7 @@ void TagActionManager::createTagActions()
// Create a action for each tag and plug it into various places
int i = 0;
const int numberOfTag(mTags.count());
foreach( const Tag::Ptr &tag, mTags ) {
foreach( const MailCommon::Tag::Ptr &tag, mTags ) {
if(tag->tagStatus)
continue;
if ( i< s_numberMaxTag )
@ -199,7 +199,7 @@ void TagActionManager::newTagEntries (const QList<Nepomuk2::Query::Result> &resu
{
foreach (const Nepomuk2::Query::Result &result, results) {
Nepomuk2::Resource resource = result.resource();
mTags.append( Tag::fromNepomuk( resource ) );
mTags.append( MailCommon::Tag::fromNepomuk( resource ) );
}
}
@ -209,7 +209,7 @@ void TagActionManager::finishedTagListing()
mTagQueryClient = 0;
if ( mTags.isEmpty() )
return;
qSort( mTags.begin(), mTags.end(), KMail::Tag::compare );
qSort( mTags.begin(), mTags.end(), MailCommon::Tag::compare );
createTagActions();
}

4
tagactionmanager.h
Unescape View File

@ -121,7 +121,7 @@ namespace KMail {
void slotNepomukStopped();
private:
void createTagAction( const KMail::Tag::Ptr &tag, bool addToMenu );
void createTagAction( const MailCommon::Tag::Ptr &tag, bool addToMenu );
void createTagActions();
KActionCollection *mActionCollection;
@ -140,7 +140,7 @@ namespace KMail {
QList<QAction*> mToolbarActions;
// Cache of the tags to avoid expensive Nepomuk queries
QList<Tag::Ptr> mTags;
QList<MailCommon::Tag::Ptr> mTags;
Nepomuk2::Query::QueryServiceClient *mTagQueryClient;
};

8
tagselectdialog.cpp
Unescape View File

@ -63,15 +63,15 @@ TagSelectDialog::TagSelectDialog( QWidget * parent, int numberOfSelectedMessages
mainLayout->addWidget(listWidgetSearchLine);
mainLayout->addWidget( mListTag );
QList<Tag::Ptr> tagList;
QList<MailCommon::Tag::Ptr> tagList;
foreach( const Nepomuk2::Tag &nepomukTag, Nepomuk2::Tag::allTags() ) {
tagList.append( Tag::fromNepomuk( nepomukTag ) );
tagList.append( MailCommon::Tag::fromNepomuk( nepomukTag ) );
}
qSort( tagList.begin(), tagList.end(), KMail::Tag::compare );
qSort( tagList.begin(), tagList.end(), MailCommon::Tag::compare );
Nepomuk2::Resource itemResource( selectedItem.url() );
foreach( const Tag::Ptr &tag, tagList ) {
foreach( const MailCommon::Tag::Ptr &tag, tagList ) {
if(tag->tagStatus)
continue;
QListWidgetItem *item = new QListWidgetItem(KIcon(tag->iconName), tag->tagName, mListTag );

Write Preview
Loading…
Cancel
Save