X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuistyle.cpp;h=5f7e27fb4cb8458e1a819c7cceb3c55e3b7af41f;hp=cc5fa26283c67e33a8688f4f7676ec9d3fcf77e0;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=61c8d84d1c849373e0f115dc748ed45cff95287d

diff --git a/src/qtui/qtuistyle.cpp b/src/qtui/qtuistyle.cpp
index cc5fa262..5f7e27fb 100644
--- a/src/qtui/qtuistyle.cpp
+++ b/src/qtui/qtuistyle.cpp
@@ -24,46 +24,51 @@
 #include <QFile>
 #include <QTextStream>
 
-QtUiStyle::QtUiStyle(QObject *parent) : UiStyle(parent) {
-  ChatViewSettings s;
-  s.notify("TimestampFormat", this, SLOT(updateTimestampFormatString()));
-  updateTimestampFormatString();
+QtUiStyle::QtUiStyle(QObject *parent) : UiStyle(parent)
+{
+    ChatViewSettings s;
+    s.notify("TimestampFormat", this, SLOT(updateTimestampFormatString()));
+    updateTimestampFormatString();
 }
 
+
 QtUiStyle::~QtUiStyle() {}
 
-void QtUiStyle::updateTimestampFormatString() {
-  ChatViewSettings s;
-  setTimestampFormatString(s.timestampFormatString());
+void QtUiStyle::updateTimestampFormatString()
+{
+    ChatViewSettings s;
+    setTimestampFormatString(s.timestampFormatString());
 }
 
-void QtUiStyle::generateSettingsQss() const {
-  QFile settingsQss(Quassel::configDirPath() + "settings.qss");
-  if(!settingsQss.open(QFile::WriteOnly|QFile::Truncate)) {
-    qWarning() << "Could not open" << settingsQss.fileName() << "for writing!";
-    return;
-  }
-  QTextStream out(&settingsQss);
 
-  out << "// Style settings made in Quassel's configuration dialog\n"
-      << "// This file is automatically generated, do not edit\n";
+void QtUiStyle::generateSettingsQss() const
+{
+    QFile settingsQss(Quassel::configDirPath() + "settings.qss");
+    if (!settingsQss.open(QFile::WriteOnly|QFile::Truncate)) {
+        qWarning() << "Could not open" << settingsQss.fileName() << "for writing!";
+        return;
+    }
+    QTextStream out(&settingsQss);
+
+    out << "// Style settings made in Quassel's configuration dialog\n"
+        << "// This file is automatically generated, do not edit\n";
 
-  // ChatView
-  ///////////
-  QtUiStyleSettings fs("Fonts");
-  if(fs.value("UseCustomChatViewFont").toBool())
-    out << "\n// ChatView Font\n"
-        << "ChatLine { " << fontDescription(fs.value("ChatView").value<QFont>()) << "; }\n";
+    // ChatView
+    ///////////
+    QtUiStyleSettings fs("Fonts");
+    if (fs.value("UseCustomChatViewFont").toBool())
+        out << "\n// ChatView Font\n"
+            << "ChatLine { " << fontDescription(fs.value("ChatView").value<QFont>()) << "; }\n";
 
-  QtUiStyleSettings s("Colors");
-  if(s.value("UseChatViewColors").toBool()) {
-    out << "\n// Custom ChatView Colors\n"
+    QtUiStyleSettings s("Colors");
+    if (s.value("UseChatViewColors").toBool()) {
+        out << "\n// Custom ChatView Colors\n"
 
         // markerline is special in that it always used to use a gradient, so we keep this behavior even with the new implementation
         << "Palette { marker-line: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 " << color("MarkerLine", s) << ", stop: 0.1 transparent); }\n"
         << "ChatView { background: " << color("ChatViewBackground", s) << "; }\n\n"
         << "ChatLine[label=\"highlight\"] {\n"
-        << "  foreground: " << color("Highlight",s) << ";\n"
+        << "  foreground: " << color("Highlight", s) << ";\n"
         << "  background: " << color("HighlightBackground", s) << ";\n"
         << "}\n\n"
         << "ChatLine::timestamp { foreground: " << color("Timestamp", s) << "; }\n\n"
@@ -87,74 +92,84 @@ void QtUiStyle::generateSettingsQss() const {
         << msgTypeQss("netsplit-quit", "CommandMsg", s)
         << msgTypeQss("invite", "CommandMsg", s)
         << "\n";
-  }
-
-  if(s.value("UseSenderColors").toBool()) {
-    out << "\n// Sender Colors\n"
-        << "ChatLine::sender#plain[sender=\"self\"] { foreground: " << color("SenderSelf", s) << "; }\n\n";
-
-    for(int i = 0; i < 16; i++)
-      out << senderQss(i, s);
-  }
-
-  // ItemViews
-  ////////////
-
-  UiStyleSettings uiFonts("Fonts");
-  if(uiFonts.value("UseCustomItemViewFont").toBool()) {
-    QString fontDesc = fontDescription(uiFonts.value("ItemView").value<QFont>());
-    out << "\n// ItemView Font\n"
-        << "ChatListItem { " << fontDesc << "; }\n"
-        << "NickListItem { " << fontDesc << "; }\n\n";
-  }
-
-  UiStyleSettings uiColors("Colors");
-  if(uiColors.value("UseBufferViewColors").toBool()) {
-    out << "\n// BufferView Colors\n"
-        << "ChatListItem { foreground: " << color("DefaultBuffer", uiColors) << "; }\n"
-        << chatListItemQss("inactive", "InactiveBuffer", uiColors)
-        << chatListItemQss("channel-event", "ActiveBuffer", uiColors)
-        << chatListItemQss("unread-message", "UnreadBuffer", uiColors)
-        << chatListItemQss("highlighted", "HighlightedBuffer", uiColors);
-  }
-
-  if(uiColors.value("UseNickViewColors").toBool()) {
-    out << "\n// NickView Colors\n"
-        << "NickListItem[type=\"category\"] { foreground: " << color("DefaultBuffer", uiColors) << "; }\n"
-        << "NickListItem[type=\"user\"] { foreground: " << color("OnlineNick", uiColors) << "; }\n"
-        << "NickListItem[type=\"user\", state=\"away\"] { foreground: " << color("AwayNick", uiColors) << "; }\n";
-  }
-
-  settingsQss.close();
+    }
+
+    if (s.value("UseSenderColors").toBool()) {
+        out << "\n// Sender Colors\n"
+            << "ChatLine::sender#plain[sender=\"self\"] { foreground: " << color("SenderSelf", s) << "; }\n\n";
+
+        for (int i = 0; i < 16; i++)
+            out << senderQss(i, s);
+    }
+
+    // ItemViews
+    ////////////
+
+    UiStyleSettings uiFonts("Fonts");
+    if (uiFonts.value("UseCustomItemViewFont").toBool()) {
+        QString fontDesc = fontDescription(uiFonts.value("ItemView").value<QFont>());
+        out << "\n// ItemView Font\n"
+            << "ChatListItem { " << fontDesc << "; }\n"
+            << "NickListItem { " << fontDesc << "; }\n\n";
+    }
+
+    UiStyleSettings uiColors("Colors");
+    if (uiColors.value("UseBufferViewColors").toBool()) {
+        out << "\n// BufferView Colors\n"
+            << "ChatListItem { foreground: " << color("DefaultBuffer", uiColors) << "; }\n"
+            << chatListItemQss("inactive", "InactiveBuffer", uiColors)
+            << chatListItemQss("channel-event", "ActiveBuffer", uiColors)
+            << chatListItemQss("unread-message", "UnreadBuffer", uiColors)
+            << chatListItemQss("highlighted", "HighlightedBuffer", uiColors);
+    }
+
+    if (uiColors.value("UseNickViewColors").toBool()) {
+        out << "\n// NickView Colors\n"
+            << "NickListItem[type=\"category\"] { foreground: " << color("DefaultBuffer", uiColors) << "; }\n"
+            << "NickListItem[type=\"user\"] { foreground: " << color("OnlineNick", uiColors) << "; }\n"
+            << "NickListItem[type=\"user\", state=\"away\"] { foreground: " << color("AwayNick", uiColors) << "; }\n";
+    }
+
+    settingsQss.close();
 }
 
-QString QtUiStyle::color(const QString &key, UiSettings &settings) const {
-  return settings.value(key).value<QColor>().name();
+
+QString QtUiStyle::color(const QString &key, UiSettings &settings) const
+{
+    return settings.value(key).value<QColor>().name();
 }
 
-QString QtUiStyle::fontDescription(const QFont &font) const {
-  QString desc = "font: ";
-  if(font.italic())
-    desc += "italic ";
-  if(font.bold())
-    desc += "bold ";
-  if(!font.italic() && !font.bold())
-    desc += "normal ";
-  desc += QString("%1pt \"%2\"").arg(font.pointSize()).arg(font.family());
-  return desc;
+
+QString QtUiStyle::fontDescription(const QFont &font) const
+{
+    QString desc = "font: ";
+    if (font.italic())
+        desc += "italic ";
+    if (font.bold())
+        desc += "bold ";
+    if (!font.italic() && !font.bold())
+        desc += "normal ";
+    desc += QString("%1pt \"%2\"").arg(font.pointSize()).arg(font.family());
+    return desc;
 }
 
-QString QtUiStyle::msgTypeQss(const QString &msgType, const QString &key, UiSettings &settings) const {
-  return QString("ChatLine#%1 { foreground: %2; }\n").arg(msgType, color(key, settings));
+
+QString QtUiStyle::msgTypeQss(const QString &msgType, const QString &key, UiSettings &settings) const
+{
+    return QString("ChatLine#%1 { foreground: %2; }\n").arg(msgType, color(key, settings));
 }
 
-QString QtUiStyle::senderQss(int i, UiSettings &settings) const {
-  QString dez = QString::number(i);
-  if(dez.length() == 1) dez.prepend('0');
 
-  return QString("ChatLine::sender#plain[sender=\"0%1\"] { foreground: %2; }\n").arg(QString::number(i, 16), color("Sender"+dez, settings));
+QString QtUiStyle::senderQss(int i, UiSettings &settings) const
+{
+    QString dez = QString::number(i);
+    if (dez.length() == 1) dez.prepend('0');
+
+    return QString("ChatLine::sender#plain[sender=\"0%1\"] { foreground: %2; }\n").arg(QString::number(i, 16), color("Sender"+dez, settings));
 }
 
-QString QtUiStyle::chatListItemQss(const QString &state, const QString &key, UiSettings &settings) const {
-  return QString("ChatListItem[state=\"%1\"] { foreground: %2; }\n").arg(state, color(key, settings));
+
+QString QtUiStyle::chatListItemQss(const QString &state, const QString &key, UiSettings &settings) const
+{
+    return QString("ChatListItem[state=\"%1\"] { foreground: %2; }\n").arg(state, color(key, settings));
 }