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

Move code to tagwidget

Browse Source
wilder-work
Montel Laurent 13 years ago
parent 2b3c1817c3
commit 7407e950e9
3 changed files with 1 additions and 245 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
      configuredialog.cpp
  2. 152
      tag.cpp
  3. 86
      tag.h

8
configuredialog.cpp
Unescape View File

@ -2122,13 +2122,7 @@ void AppearancePage::MessageTagTab::save()
MailCommon::Tag::Ptr tag = tagItem->kmailTag();
tag->priority = i;
MailCommon::Tag::SaveFlags saveFlags = 0;
if ( mTagWidget->textColorCheck()->isChecked() )
saveFlags |= MailCommon::Tag::TextColor;
if ( mTagWidget->backgroundColorCheck()->isChecked() )
saveFlags |= MailCommon::Tag::BackgroundColor;
if ( mTagWidget->textFontCheck()->isChecked() )
saveFlags |= MailCommon::Tag::Font;
MailCommon::Tag::SaveFlags saveFlags = mTagWidget->saveFlags();
tag->saveToNepomuk( saveFlags );
}
}

152
tag.cpp
Unescape View File

@ -1,152 +0,0 @@
/* Copyright 2010 Thomas McGuire <mcguire@kde.org>
Copyright 2012 Laurent Montel <montel@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of
the License or (at your option) version 3 or any later version
accepted by the membership of KDE e.V. (or its successor approved
by the membership of KDE e.V.), which shall act as a proxy
defined in Section 14 of version 3 of the license.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "tag.h"
#include "messagetag.h"
#include <soprano/nao.h>
#include <Nepomuk2/Tag>
#include <Nepomuk2/Variant>
#include <QDebug>
using namespace KMail;
Tag::Ptr Tag::fromNepomuk( const Nepomuk2::Tag& nepomukTag )
{
Tag::Ptr tag( new Tag() );
tag->tagName = nepomukTag.label();
tag->iconName = nepomukTag.genericIcon();
if ( tag->iconName.isEmpty() )
tag->iconName = "mail-tagged";
tag->nepomukResourceUri = nepomukTag.uri();
const QString identifier = nepomukTag.property( Soprano::Vocabulary::NAO::identifier() ).toString();
tag->tagStatus = (identifier == QLatin1String("important")) ||
(identifier == QLatin1String("todo")) ||
(identifier == QLatin1String("watched")) ||
(identifier == QLatin1String("deleted")) ||
(identifier == QLatin1String("spam")) ||
(identifier == QLatin1String("replied")) ||
(identifier == QLatin1String("ignored")) ||
(identifier == QLatin1String("forwarded")) ||
(identifier == QLatin1String("sent")) ||
(identifier == QLatin1String("queued")) ||
(identifier == QLatin1String("ham"));
if ( nepomukTag.hasProperty( Vocabulary::MessageTag::textColor() ) ) {
const QString name = nepomukTag.property( Vocabulary::MessageTag::textColor() ).toString();
tag->textColor = QColor( name );
}
if ( nepomukTag.hasProperty( Vocabulary::MessageTag::backgroundColor() ) ) {
const QString name = nepomukTag.property( Vocabulary::MessageTag::backgroundColor() ).toString();
tag->backgroundColor = QColor( name );
}
if ( nepomukTag.hasProperty( Vocabulary::MessageTag::font() ) ) {
const QString fontString = nepomukTag.property( Vocabulary::MessageTag::font() ).toString();
QFont font;
font.fromString( fontString );
tag->textFont = font;
}
if ( nepomukTag.hasProperty( Vocabulary::MessageTag::priority() ) ) {
tag->priority = nepomukTag.property( Vocabulary::MessageTag::priority() ).toInt();
}
else
tag->priority = -1;
if ( nepomukTag.hasProperty( Vocabulary::MessageTag::shortcut() ) ) {
tag->shortcut = KShortcut( nepomukTag.property( Vocabulary::MessageTag::shortcut() ).toString() );
}
if ( nepomukTag.hasProperty( Vocabulary::MessageTag::inToolbar() ) ) {
tag->inToolbar = nepomukTag.property( Vocabulary::MessageTag::inToolbar() ).toBool();
}
else
tag->inToolbar = false;
return tag;
}
void Tag::saveToNepomuk( SaveFlags saveFlags ) const
{
Nepomuk2::Tag nepomukTag( nepomukResourceUri );
nepomukTag.setLabel( tagName );
Nepomuk2::Resource symbol( QUrl(), Soprano::Vocabulary::NAO::FreeDesktopIcon() );
symbol.setProperty( Soprano::Vocabulary::NAO::iconName(), iconName );
nepomukTag.setProperty( Soprano::Vocabulary::NAO::hasSymbol(), symbol );
nepomukTag.setProperty( Vocabulary::MessageTag::priority(), priority );
nepomukTag.setProperty( Vocabulary::MessageTag::inToolbar(), inToolbar );
nepomukTag.setProperty( Vocabulary::MessageTag::shortcut(), shortcut.toString() );
if ( textColor.isValid() && saveFlags & TextColor )
nepomukTag.setProperty( Vocabulary::MessageTag::textColor(), textColor.name() );
else
nepomukTag.removeProperty( Vocabulary::MessageTag::textColor() );
if ( backgroundColor.isValid() && saveFlags & BackgroundColor )
nepomukTag.setProperty( Vocabulary::MessageTag::backgroundColor(), backgroundColor.name() );
else
nepomukTag.removeProperty( Vocabulary::MessageTag::backgroundColor() );
if ( saveFlags & Font )
nepomukTag.setProperty( Vocabulary::MessageTag::font(), textFont.toString() );
else
nepomukTag.removeProperty( Vocabulary::MessageTag::font() );
}
bool Tag::compare( Tag::Ptr &tag1, Tag::Ptr &tag2 )
{
if ( tag1->priority < tag2->priority )
return true;
else if (tag1->priority == tag2->priority)
return ( tag1->tagName < tag2->tagName );
else
return false;
}
bool Tag::compareName( Tag::Ptr &tag1, Tag::Ptr &tag2 )
{
return ( tag1->tagName < tag2->tagName );
}
bool Tag::operator==( const Tag &other ) const
{
return tagName == other.tagName &&
textColor == other.textColor &&
backgroundColor == other.backgroundColor &&
textFont == other.textFont &&
iconName == other.iconName &&
inToolbar == other.inToolbar &&
shortcut.toString() == other.shortcut.toString() &&
priority == other.priority &&
nepomukResourceUri == other.nepomukResourceUri;
}
bool Tag::operator!=( const Tag &other ) const
{
return !( *this == other );
}

86
tag.h
Unescape View File

@ -1,86 +0,0 @@
/* Copyright 2010 Thomas McGuire <mcguire@kde.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of
the License or (at your option) version 3 or any later version
accepted by the membership of KDE e.V. (or its successor approved
by the membership of KDE e.V.), which shall act as a proxy
defined in Section 14 of version 3 of the license.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef TAG_H
#define TAG_H
#include <KShortcut>
#include <QColor>
#include <QFont>
#include <QSharedPointer>
#include <QUrl>
namespace Nepomuk2 {
class Tag;
}
namespace KMail {
// Our own copy of the tag data normally attached to a Nepomuk2::Tag.
// Useful in the config dialog, because the user might cancel his changes,
// in which case we don't write them back to the Nepomuk2::Tag.
// Also used as a convenience class in the TagActionManager.
class Tag
{
Q_GADGET
public:
typedef QSharedPointer<Tag> Ptr;
enum SaveFlag {
TextColor = 1,
BackgroundColor = 1 << 1,
Font = 1 << 2
};
typedef QFlags<SaveFlag> SaveFlags;
// Returns true if two tags are equal
bool operator==( const Tag &other ) const;
bool operator!=( const Tag &other ) const;
// Load a tag from a Nepomuk tag
static Ptr fromNepomuk( const Nepomuk2::Tag& nepomukTag );
// Save this tag to Nepomuk the corresponding Nepomuk tag
void saveToNepomuk( SaveFlags saveFlags ) const;
// Compare, based on priority
static bool compare( Ptr &tag1, Ptr &tag2 );
// Compare, based on name
static bool compareName( Ptr &tag1, Ptr &tag2 );
QString tagName;
QColor textColor;
QColor backgroundColor;
QFont textFont;
QString iconName;
QUrl nepomukResourceUri;
KShortcut shortcut;
bool inToolbar;
bool tagStatus;
// Priority, i.e. sort order of the tag. Only used when loading the tag, when saving
// the priority is set to the position in the list widget
int priority;
};
Q_DECLARE_OPERATORS_FOR_FLAGS(Tag::SaveFlags)
}
#endif
Write Preview
Loading…
Cancel
Save