Changeset 188 for smplayer/trunk/src/assstyles.cpp

Timestamp:

Jan 24, 2017, 12:41:54 PM (8 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to version 17.1.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/assstyles.cpp (modified) (4 diffs)

smplayer/trunk/src/assstyles.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -26 +26 @@
         fontname = "Arial";
         fontsize = 20;
-        primarycolor = 0xFFFFFF;
-        backcolor = 0;
-        outlinecolor = 0;
+        primarycolor = QColor("#FFFFFF");
+        backcolor = QColor("#000000");
+        outlinecolor = QColor("#000000");
         bold = false;
         italic = false;
@@ -46 +46 @@
         set->setValue("styles/fontname", fontname);
         set->setValue("styles/fontsize", fontsize);
-        set->setValue("styles/primarycolor", primarycolor);
-        set->setValue("styles/backcolor", backcolor);
-        set->setValue("styles/outlinecolor", outlinecolor);
+        set->setValue("styles/primarycolor/argb", ColorUtils::colorToAARRGGBB(primarycolor));
+        set->setValue("styles/backcolor/argb", ColorUtils::colorToAARRGGBB(backcolor));
+        set->setValue("styles/outlinecolor/argb", ColorUtils::colorToAARRGGBB(outlinecolor));
         set->setValue("styles/bold", bold);
         set->setValue("styles/italic", italic);
@@ -66 +66 @@
         fontname = set->value("styles/fontname", fontname).toString();
         fontsize = set->value("styles/fontsize", fontsize).toInt();
-        primarycolor = set->value("styles/primarycolor", primarycolor).toInt();
-        backcolor = set->value("styles/backcolor", backcolor).toInt();
-        outlinecolor = set->value("styles/outlinecolor", outlinecolor).toInt();
+
+        primarycolor = ColorUtils::AARRGGBBToColor(set->value("styles/primarycolor/argb", "#FFFFFFFF").toString());
+        backcolor = ColorUtils::AARRGGBBToColor(set->value("styles/backcolor/argb", "#FF000000").toString());
+        outlinecolor = ColorUtils::AARRGGBBToColor(set->value("styles/outlinecolor/argb", "#FF000000").toString());
+
         bold = set->value("styles/bold", bold).toBool();
         italic = set->value("styles/italic", italic).toBool();