Commit: b532dd57844627c7f2fdefb1013b7dfe7b426096 - FFU (git)

Commit MetaInfo

• Revision: b532dd57844627c7f2fdefb1013b7dfe7b426096 (tree)
• Zeit: 2014-04-15 10:33:00
• Autor: jakago <jakago777@gmai...>
• Commiter: jakago

Log Message

GUI変更中

Ändern Zusammenfassung

• modified: CaptureStream.pro
• modified: mainwindow.cpp
• modified: stylesheet-mac.qss
• modified: stylesheet-ubu.qss
• modified: stylesheet-win.qss
• modified: stylesheet.qrc

Diff

--- a/CaptureStream.pro
+++ b/CaptureStream.pro
@@ -54,7 +54,9 @@ macx {
 }
 
 OTHER_FILES += \
-    stylesheet.qss
+	stylesheet-mac.qss \
+	stylesheet-win.qss \
+	stylesheet-ubu.qss
 
 RESOURCES += \
     stylesheet.qrc

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -51,7 +51,16 @@
 #define SCRAMBLE_URL1 "http://www47.atwiki.jp/jakago/pub/scramble.xml"
 #define SCRAMBLE_URL2 "http://cdn47.atwikiimg.com/jakago/pub/scramble.xml"
 #define X11_WINDOW_VERTICAL_INCREMENT 5
-#define STYLE_SHEET "stylesheet.qss"
+
+#ifdef QT4_QT5_WIN
+#define STYLE_SHEET "stylesheet-win.qss"
+#else
+#ifdef QT4_QT5_MAC
+#define STYLE_SHEET "stylesheet-mac.qss"
+#else
+#define STYLE_SHEET "stylesheet-ubu.qss"
+#endif
+#endif
 
 namespace {
 	bool outputDirSpecified = false;

--- a/stylesheet-mac.qss
+++ b/stylesheet-mac.qss
@@ -1,8 +1,8 @@
 QWidget {
-	/*
-	font-family: Verdana, "游ゴシック", YuGothic, "ヒラギノ角ゴ ProN W3", "Hiragino Kaku Gothic ProN", "メイリオ", Meiryo, sans-serif;
-	*/
-	font-family: "Times New Roman", "游明朝", YuMincho, "ヒラギノ明朝 ProN W3", "Hiragino Mincho ProN", "メイリオ", Meiryo, serif;
+	font-family: "Times New Roman", serif;
+	font-size: 12pt;
+	font-weight: bold;
+	font-style: normal;
 	background-color: gainsboro;
 	/*
 	background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 whitesmoke, stop: 1 silver);

--- a/stylesheet-ubu.qss
+++ b/stylesheet-ubu.qss
@@ -1,6 +1,6 @@
 QWidget {
-	font-family: "Times New Roman";
-	font-size: 12pt;
+	font-family: "Times New Roman", serif;
+	font-size: 10pt;
 	font-weight: bold;
 	font-style: normal;
 	background-color: gainsboro;

--- a/stylesheet-win.qss
+++ b/stylesheet-win.qss
@@ -1,6 +1,6 @@
 QWidget {
-	font-family: "Times New Roman";
-	font-size: 12pt;
+	font-family: "MS PMincho", serif;
+	font-size: 10pt;
 	font-weight: bold;
 	font-style: normal;
 	background-color: gainsboro;

--- a/stylesheet.qrc
+++ b/stylesheet.qrc
@@ -1,5 +1,7 @@
 <RCC>
-<qresource prefix="/">
-    <file>stylesheet.qss</file>
-</qresource>
+    <qresource prefix="/">
+        <file>stylesheet-mac.qss</file>
+        <file>stylesheet-ubu.qss</file>
+        <file>stylesheet-win.qss</file>
+    </qresource>
 </RCC>