X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.h;h=4e90951706b666c9c7df70e406fa1412d4b17f23;hp=d950c729dc43cb0ed99b53b997b87d6d09d2c420;hb=16f22647e6890d3eb8c3e94f7a0700e12fa29e44;hpb=921e54680da16fcf2adb7a90506875aceb6633a4

diff --git a/src/qtui/chatscene.h b/src/qtui/chatscene.h
index d950c729..4e909517 100644
--- a/src/qtui/chatscene.h
+++ b/src/qtui/chatscene.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -149,7 +149,7 @@ public slots:
 
     void requestBacklog();
 
-#ifdef HAVE_WEBKIT
+#if defined HAVE_WEBKIT || defined HAVE_WEBENGINE
     void loadWebPreview(ChatItem *parentItem, const QUrl &url, const QRectF &urlRect);
     void clearWebPreview(ChatItem *parentItem = 0);
 #endif
@@ -175,11 +175,35 @@ protected slots:
 private slots:
     void firstHandlePositionChanged(qreal xpos);
     void secondHandlePositionChanged(qreal xpos);
-#ifdef HAVE_WEBKIT
+#if defined HAVE_WEBKIT || defined HAVE_WEBENGINE
     void webPreviewNextStep();
 #endif
     void showWebPreviewChanged();
 
+    /**
+     * Updates the local setting cache of whether or not to show sender brackets
+     */
+    void showSenderBracketsChanged();
+
+    /**
+     * Updates the local setting cache of whether or not to use the custom timestamp format
+     */
+    void useCustomTimestampFormatChanged();
+
+    /**
+     * Updates the local setting cache of the timestamp format string
+     */
+    void timestampFormatStringChanged();
+
+    /**
+     * Updates the status of whether or not the timestamp format string contains brackets
+     *
+     * When the timestamp contains brackets -and- showSenderBrackets is disabled, we need to
+     * automatically add brackets.  This function checks if the timestamp has brackets and stores
+     * the result, rather than checking each time text is copied.
+     */
+    void updateTimestampHasBrackets();
+
     void rowsRemoved();
 
     void clickTimeout();
@@ -226,9 +250,15 @@ private:
 
     bool _showWebPreview;
 
+    bool _showSenderBrackets;  /// If true, show brackets around sender names
+
+    bool _useCustomTimestampFormat; /// If true, use the custom timestamp format
+    QString _timestampFormatString; /// Format of the timestamp string
+    bool _timestampHasBrackets;     /// If true, timestamp format has [brackets] of some sort
+
     static const int _webSearchSelectionTextMaxVisible = 24;
 
-#ifdef HAVE_WEBKIT
+#if defined HAVE_WEBKIT || defined HAVE_WEBENGINE
     struct WebPreview {
         enum PreviewState {
             NoPreview,
@@ -246,7 +276,7 @@ private:
         WebPreview() : parentItem(0), previewItem(0), previewState(NoPreview) {}
     };
     WebPreview webPreview;
-#endif // HAVE_WEBKIT
+#endif // HAVE_WEBKIT || HAVE_WEBENGINE
 };