Merged changes from branch "sput" r50:55 back into trunk.

[quassel.git] / gui / style.h

diff --git a/network/buffer.h b/gui/style.h
similarity index 74%
rename from network/buffer.h
rename to gui/style.h
index 8429cfc..19c3be6 100644 (file)
--- a/network/buffer.h
+++ b/gui/style.h
@@ -18,36 +18,33 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-/* THIS CODE IS OBSOLETE, PENDING REMOVAL */
-
-#ifndef _BUFFER_OLD_H_
-#define _BUFFER_OLD_H_
+#ifndef _STYLE_H_
+#define _STYLE_H_
 
 #include <QtCore>
+#include <QtGui>
 
-class Buffer_old : public QObject {
-  Q_OBJECT
+class Style {
 
   public:
-    Buffer(QString name);
+    static void init();
 
-    QString name() { return _name; }
-    QString topic() { return _topic; }
+    struct StringFormats {
+      QString text;
+      QList<QTextLayout::FormatRange> formats;
+    };
 
-  public slots:
-    //void setNicks(QStringList nicks);
-    //void addNick(QString nick);
-    //void removeNick(QString nick);
+    static QString mircToInternal(QString);
+    //static QString internalToMirc(QString);
+    static StringFormats internalToFormatted(QString);
+    static int sepTsSender() { return 10; }
+    static int sepSenderText() { return 10; }
 
-  signals:
 
   private:
-    QString _name;
-    QString _topic;
-    QStringList nicks;
+    static QHash<QString, QTextCharFormat> formats;
+    static QHash<QString, QColor> colors;
 
 };
 
-
-
 #endif