fix most bugs of nurupo#122

Schlumpf · Jun 27, 2014 · a7aa410 · a7aa410
1 parent d844a78
commit a7aa410
Show file tree

Hide file tree

Showing 11 changed files with 107 additions and 82 deletions.
diff --git a/resources/icons/emoticons/theme b/resources/icons/emoticons/theme
@@ -0,0 +1,20 @@
+Name = TOX Qt GUI Smileys
+Author = FatCow
+Description = A default smileypack for TOX Qt GUI.
+Verion = 0.1
+
+[theme]
+emotion_smile.png    :) :-) :o)
+emotion_sad.png      :( :-(
+emotion_grin.png     :D :-D
+emotion_cool.png     8) 8-)
+emotion_suprised.png :O :-O
+emotion_wink.png     ;) ;-)
+emotion_cry.png      ;( ;-(
+emotion_sweat.png    (:|
+emotion_kiss.png     :* :-*
+emotion_tongue.png   :P :-P
+emotion_angel.png    O:) O:-) o:) o:-) (angel)
+emotion_doubt.png    :^) :^-)
+emotion_love.png     (inlove)
+emotion_evilgrin.png ]:) ]:-)
diff --git a/resources/resources.qrc b/resources/resources.qrc
@@ -13,20 +13,6 @@
         <file>icons/database.png</file>
         <file>icons/icon64.png</file>
         <file>icons/cog.png</file>
-        <file>icons/emoticons/emotion_angel.png</file>
-        <file>icons/emoticons/emotion_kiss.png</file>
-        <file>icons/emoticons/emotion_smile.png</file>
-        <file>icons/emoticons/emotion_wink.png</file>
-        <file>icons/emoticons/emotion_love.png</file>
-        <file>icons/emoticons/emotion_grin.png</file>
-        <file>icons/emoticons/emotion_cool.png</file>
-        <file>icons/emoticons/emotion_suprised.png</file>
-        <file>icons/emoticons/emotion_cry.png</file>
-        <file>icons/emoticons/emotion_sweat.png</file>
-        <file>icons/emoticons/emotion_sad.png</file>
-        <file>icons/emoticons/emotion_tongue.png</file>
-        <file>icons/emoticons/emotion_doubt.png</file>
-        <file>icons/emoticons/emotion_evilgrin.png</file>
         <file>icons/error.png</file>
         <file>icons/status_away.png</file>
         <file>icons/status_busy.png</file>

diff --git a/src/Settings/settings.cpp b/src/Settings/settings.cpp
@@ -296,8 +296,10 @@ const QString &Settings::getTimestampFormat() const
 
 void Settings::setTimestampFormat(const QString &format)
 {
-    timestampFormat = format;
-    emit timestampFormatChanged();
+    if (timestampFormat != format) {
+        timestampFormat = format;
+        emit timestampFormatChanged();
+    }
 }
 
 bool Settings::isMinimizeOnCloseEnabled() const
@@ -311,63 +313,63 @@ void Settings::setMinimizeOnClose(bool newValue)
 }
 
 // Smileys
-bool Settings::isSmileyReplacementEnabled() const
+void Settings::setSmileySettings(bool replacementEnabled, int type, const QString &packPath, bool eFontOverride, const QString &eFontFamily, int eFontPointSize, bool eSendPlaintext)
 {
-    return smileyReplacementEnabled;
+    bool changed = false;
+    if (smileyReplacementEnabled != replacementEnabled) {
+        smileyReplacementEnabled = replacementEnabled;
+        changed = true;
+    }
+    if (smileyType != type) {
+        smileyType = type;
+        changed = true;
+    }
+    if (smileyPackPath != packPath) {
+        smileyPackPath = packPath;
+        emit smileyPackChanged();
+        changed = true;
+    }
+    if (emojiFontOverride != eFontOverride) {
+        emojiFontOverride = eFontOverride;
+        changed = true;
+    }
+    if (emojiFontFamily != eFontFamily) {
+        emojiFontFamily = eFontFamily;
+        changed = true;
+    }
+    if (emojiFontPointSize != eFontPointSize) {
+        emojiFontPointSize = eFontPointSize;
+        changed = true;
+    }
+    if (emojiSendPlaintext != eSendPlaintext) {
+        emojiSendPlaintext = eSendPlaintext;
+        changed = true;
+    }
+
+    if(changed)
+        emit smileySettingsChanged();
 }
 
-void Settings::setSmileyReplacementEnabled(bool value)
+bool Settings::isSmileyReplacementEnabled() const
 {
-    smileyReplacementEnabled = value;
-    emit smileySettingsChanged();
+    return smileyReplacementEnabled;
 }
 
 int Settings::getSmileyType() const
 {
     return smileyType;
 }
 
-void Settings::setSmileyType(int value)
-{
-    smileyType = value;
-    emit smileySettingsChanged();
-}
-
 QString Settings::getSmileyPackPath() const
 {
     return smileyPackPath;
 }
 
-void Settings::setSmileyPackPath(const QString &value)
-{
-    smileyPackPath = value;
-    emit smileyPackChanged();
-    emit smileySettingsChanged();
-}
-
 bool Settings::isCurstomEmojiFont() const
 {
     return emojiFontOverride;
 }
 
-void Settings::setCurstomEmojiFont(bool value)
-{
-    emojiFontOverride = value;
-    emit smileySettingsChanged();
-}
-
-void Settings::setEmojiFontFamily(const QString &value)
-{
-    emojiFontFamily = value;
-    emit smileySettingsChanged();
-}
-
-void Settings::setEmojiFontPointSize(int value)
-{
-    emojiFontPointSize = value;
-    emit smileySettingsChanged();
-}
-
 QFont Settings::getEmojiFont() const
 {
     return QFont(emojiFontFamily, emojiFontPointSize);
@@ -378,11 +380,6 @@ bool Settings::isEmojiSendPlaintext() const
     return emojiSendPlaintext;
 }
 
-void Settings::setEmojiSendPlaintext(bool value)
-{
-    emojiSendPlaintext = value;
-}
-
 // Privacy
 bool Settings::isTypingNotificationEnabled() const
 {

diff --git a/src/Settings/settings.hpp b/src/Settings/settings.hpp
@@ -94,24 +94,14 @@ class Settings : public QObject
     void setMinimizeOnClose(bool newValue);
 
     // Smileys
-    bool isSmileyReplacementEnabled() const;
-    void setSmileyReplacementEnabled(bool value);
+    void setSmileySettings(bool replacementEnabled, int type, const QString &packPath, bool eFontOverride, const QString &eFontFamily, int eFontPointSize, bool eSendPlaintext);
 
+    bool isSmileyReplacementEnabled() const;
     int getSmileyType() const;
-    void setSmileyType(int value);
-
     QString getSmileyPackPath() const;
-    void setSmileyPackPath(const QString &value);
-
     bool isCurstomEmojiFont() const;
-    void setCurstomEmojiFont(bool value);
-
-    void setEmojiFontFamily(const QString &value);
-    void setEmojiFontPointSize(int value);
     QFont getEmojiFont() const;
-
     bool isEmojiSendPlaintext() const;
-    void setEmojiSendPlaintext(bool value);
 
     // Privacy
     bool isTypingNotificationEnabled() const;

diff --git a/src/Settings/smileysettingspage.cpp b/src/Settings/smileysettingspage.cpp
@@ -81,15 +81,13 @@ void SmileySettingsPage::setGui()
 void SmileySettingsPage::applyChanges()
 {
     Settings& settings = Settings::getInstance();
-
-    // Emoji font settings
-    settings.setSmileyReplacementEnabled(mSmileyGroup->isChecked());
-    settings.setSmileyType(mSmileyType->currentData().toInt());
-    settings.setCurstomEmojiFont(mEmojiFontGroup->isChecked());
-    settings.setEmojiFontFamily(mEmojiFontComboBox->itemText(mEmojiFontComboBox->currentIndex()));
-    settings.setEmojiFontPointSize(mEmojiFontSizeSpinBox->value());
-    settings.setEmojiSendPlaintext(mSendPlaintextCheckbox->isChecked());
-    settings.setSmileyPackPath(mSmileyPacks.at(mSmileypackCombobox->currentIndex())->getThemeFile());
+    settings.setSmileySettings(mSmileyGroup->isChecked(),
+                               mSmileyType->currentData().toInt(),
+                               mSmileyPacks.at(mSmileypackCombobox->currentIndex())->getThemeFile(),
+                               mEmojiFontGroup->isChecked(),
+                               mEmojiFontComboBox->itemText(mEmojiFontComboBox->currentIndex()),
+                               mEmojiFontSizeSpinBox->value(),
+                               mSendPlaintextCheckbox->isChecked());
 }
 
 /*void SmileySettingsPage::updateEmojiFontPreview()

diff --git a/src/messages/chatitem.cpp b/src/messages/chatitem.cpp
@@ -46,9 +46,7 @@ ChatItem::ChatItem(const QRectF &boundingRect, ChatLine *parent) :
 
 ChatItem::~ChatItem()
 {
-    if(mDoc)
-        delete mDoc;
-
+    clearCache();
     qDeleteAll(mHighlights);
 }
 

diff --git a/src/messages/chatscene.cpp b/src/messages/chatscene.cpp
@@ -863,6 +863,12 @@ void ChatScene::clickTimeout()
         handleClick(Qt::LeftButton, _clickPos);
 }
 
+/*! Relayouts the whole scene */
+void ChatScene::updateLayout()
+{
+    layout(0, _lines.count()-1, _sceneRect.width());
+}
+
 void ChatScene::setHandleXLimits()
 {
     _firstColHandle->setXLimits(0, _secondColHandle->sceneLeft() - minContentsWidth);

diff --git a/src/messages/chatscene.hpp b/src/messages/chatscene.hpp
@@ -98,6 +98,7 @@ public slots:
     void updateForViewport(qreal width, qreal height);
     void setWidth(qreal width);
     void layout(int start, int end, qreal width);
+    void updateLayout();
 
     void setMarkerLineValid(bool valid = true);
     void setMarkerLineVisible(bool visible = true);

diff --git a/src/messages/chatview.cpp b/src/messages/chatview.cpp
@@ -52,7 +52,8 @@ ChatView::ChatView(MessageFilter *model, QWidget *parent) :
     _lastScrollbarPos = verticalScrollBar()->value();
 
     // Update timstamps
-    connect(&Settings::getInstance(), &Settings::timestampFormatChanged, this, &ChatView::clearCache);
+    connect(&Settings::getInstance(), &Settings::timestampFormatChanged, this, &ChatView::clearTimestampCache);
+    connect(&Settings::getInstance(), &Settings::smileySettingsChanged, this, &ChatView::clearContentCacheAndRelayout);
 
     // Actions
     hidePlain = new QAction(tr("Text messages"), this);
@@ -183,6 +184,31 @@ void ChatView::clearCache()
     }
 }
 
+void ChatView::clearTimestampCache()
+{
+    QSet<ChatLine *>::iterator iter = _linesWithCache.begin();
+    while (iter != _linesWithCache.end()) {
+        ChatLine *line = *iter;
+        line->timestampItem()->clearCache();
+        iter = _linesWithCache.erase(iter);
+        line->update();
+    }
+}
+
+void ChatView::clearContentCacheAndRelayout()
+{
+    // Clear content cache
+    QSet<ChatLine *>::iterator iter = _linesWithCache.begin();
+    while (iter != _linesWithCache.end()) {
+        ChatLine *line = *iter;
+        line->contentsItem()->clearCache();
+        iter = _linesWithCache.erase(iter);
+        line->update();
+    }
+
+    scene()->updateLayout();
+}
+
 void ChatView::setTypingNotificationVisible(const QString &name, bool visible)
 {
     scene()->setTypingNotificationVisible(name, visible);

diff --git a/src/messages/chatview.hpp b/src/messages/chatview.hpp
@@ -66,6 +66,8 @@ class ChatView : public QGraphicsView
 
 public slots:
     void clearCache();
+    void clearTimestampCache();
+    void clearContentCacheAndRelayout();
     inline virtual void clear() {}
 
     void setTypingNotificationVisible(const QString &name, bool visible = true);

diff --git a/src/messages/chatviewsearchwidget.cpp b/src/messages/chatviewsearchwidget.cpp
@@ -32,6 +32,7 @@ ChatViewSearchWidget::ChatViewSearchWidget(QWidget *parent) :
     mRegularMsgOnly(true)
 {
     setHidden(true);
+    mSearchEnabled = false;
     setIconSize(QSize(16,16));
 
     mSearchDelayTimer.setSingleShot(true);