• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythongamewindowsbathyscaphephpguic翻訳omegattwitterframeworktestbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

Commit MetaInfo

Revisãob532dd57844627c7f2fdefb1013b7dfe7b426096 (tree)
Hora2014-04-15 10:33:00
Autorjakago <jakago777@gmai...>
Commiterjakago

Mensagem de Log

GUI変更中

Mudança Sumário

Diff

--- a/CaptureStream.pro
+++ b/CaptureStream.pro
@@ -54,7 +54,9 @@ macx {
5454 }
5555
5656 OTHER_FILES += \
57- stylesheet.qss
57+ stylesheet-mac.qss \
58+ stylesheet-win.qss \
59+ stylesheet-ubu.qss
5860
5961 RESOURCES += \
6062 stylesheet.qrc
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -51,7 +51,16 @@
5151 #define SCRAMBLE_URL1 "http://www47.atwiki.jp/jakago/pub/scramble.xml"
5252 #define SCRAMBLE_URL2 "http://cdn47.atwikiimg.com/jakago/pub/scramble.xml"
5353 #define X11_WINDOW_VERTICAL_INCREMENT 5
54-#define STYLE_SHEET "stylesheet.qss"
54+
55+#ifdef QT4_QT5_WIN
56+#define STYLE_SHEET "stylesheet-win.qss"
57+#else
58+#ifdef QT4_QT5_MAC
59+#define STYLE_SHEET "stylesheet-mac.qss"
60+#else
61+#define STYLE_SHEET "stylesheet-ubu.qss"
62+#endif
63+#endif
5564
5665 namespace {
5766 bool outputDirSpecified = false;
--- a/stylesheet-mac.qss
+++ b/stylesheet-mac.qss
@@ -1,8 +1,8 @@
11 QWidget {
2- /*
3- font-family: Verdana, "游ゴシック", YuGothic, "ヒラギノ角ゴ ProN W3", "Hiragino Kaku Gothic ProN", "メイリオ", Meiryo, sans-serif;
4- */
5- font-family: "Times New Roman", "游明朝", YuMincho, "ヒラギノ明朝 ProN W3", "Hiragino Mincho ProN", "メイリオ", Meiryo, serif;
2+ font-family: "Times New Roman", serif;
3+ font-size: 12pt;
4+ font-weight: bold;
5+ font-style: normal;
66 background-color: gainsboro;
77 /*
88 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 @@
11 QWidget {
2- font-family: "Times New Roman";
3- font-size: 12pt;
2+ font-family: "Times New Roman", serif;
3+ font-size: 10pt;
44 font-weight: bold;
55 font-style: normal;
66 background-color: gainsboro;
--- a/stylesheet-win.qss
+++ b/stylesheet-win.qss
@@ -1,6 +1,6 @@
11 QWidget {
2- font-family: "Times New Roman";
3- font-size: 12pt;
2+ font-family: "MS PMincho", serif;
3+ font-size: 10pt;
44 font-weight: bold;
55 font-style: normal;
66 background-color: gainsboro;
--- a/stylesheet.qrc
+++ b/stylesheet.qrc
@@ -1,5 +1,7 @@
11 <RCC>
2-<qresource prefix="/">
3- <file>stylesheet.qss</file>
4-</qresource>
2+ <qresource prefix="/">
3+ <file>stylesheet-mac.qss</file>
4+ <file>stylesheet-ubu.qss</file>
5+ <file>stylesheet-win.qss</file>
6+ </qresource>
57 </RCC>