| Revisión | 851996e39b392153ff2315d546b73733f3f5eaf6 (tree) |
|---|---|
| Tiempo | 2014-04-13 22:36:08 |
| Autor |  jakago <jakago777@gmai...> |
| Commiter | jakago |
GUI変更中
mainwindow.ui (diff)
messagewindow.cpp (diff) stylesheet.qrc (diff) stylesheet.qss (diff)| @@ -6,26 +6,26 @@ | ||
| 6 | 6 | <rect> |
| 7 | 7 | <x>0</x> |
| 8 | 8 | <y>0</y> |
| 9 | - <width>500</width> | |
| 10 | - <height>420</height> | |
| 9 | + <width>540</width> | |
| 10 | + <height>500</height> | |
| 11 | 11 | </rect> |
| 12 | 12 | </property> |
| 13 | 13 | <property name="sizePolicy"> |
| 14 | - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | |
| 14 | + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> | |
| 15 | 15 | <horstretch>0</horstretch> |
| 16 | 16 | <verstretch>0</verstretch> |
| 17 | 17 | </sizepolicy> |
| 18 | 18 | </property> |
| 19 | 19 | <property name="minimumSize"> |
| 20 | 20 | <size> |
| 21 | - <width>500</width> | |
| 22 | - <height>420</height> | |
| 21 | + <width>540</width> | |
| 22 | + <height>500</height> | |
| 23 | 23 | </size> |
| 24 | 24 | </property> |
| 25 | 25 | <property name="maximumSize"> |
| 26 | 26 | <size> |
| 27 | - <width>500</width> | |
| 28 | - <height>420</height> | |
| 27 | + <width>540</width> | |
| 28 | + <height>500</height> | |
| 29 | 29 | </size> |
| 30 | 30 | </property> |
| 31 | 31 | <property name="font"> |
| @@ -48,8 +48,8 @@ | ||
| 48 | 48 | <rect> |
| 49 | 49 | <x>10</x> |
| 50 | 50 | <y>10</y> |
| 51 | - <width>481</width> | |
| 52 | - <height>361</height> | |
| 51 | + <width>521</width> | |
| 52 | + <height>437</height> | |
| 53 | 53 | </rect> |
| 54 | 54 | </property> |
| 55 | 55 | <layout class="QGridLayout" name="gridLayout_3" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0,0"> |
| @@ -1047,7 +1047,7 @@ | ||
| 1047 | 1047 | <rect> |
| 1048 | 1048 | <x>0</x> |
| 1049 | 1049 | <y>0</y> |
| 1050 | - <width>500</width> | |
| 1050 | + <width>540</width> | |
| 1051 | 1051 | <height>22</height> |
| 1052 | 1052 | </rect> |
| 1053 | 1053 | </property> |
| @@ -32,8 +32,17 @@ | ||
| 32 | 32 | namespace { |
| 33 | 33 | const QString SETTING_GROUP( "MessageWindow" ); |
| 34 | 34 | const QString SETTING_GEOMETRY( "geometry" ); |
| 35 | - const int DEFAULT_WIDTH = 500; | |
| 35 | + const int DEFAULT_WIDTH = 540; | |
| 36 | 36 | const int DEFAULT_HEIGHT = 300; |
| 37 | +#ifdef QT4_QT5_WIN | |
| 38 | + const int FONT_SIZE = 13; | |
| 39 | +#else | |
| 40 | +#ifdef QT4_QT5_MAC | |
| 41 | + const int FONT_SIZE = 11; | |
| 42 | +#else | |
| 43 | + const int FONT_SIZE = 14; | |
| 44 | +#endif | |
| 45 | +#endif | |
| 37 | 46 | } |
| 38 | 47 | |
| 39 | 48 | MessageWindow::MessageWindow(QWidget *parent) : |
| @@ -64,7 +73,7 @@ void MessageWindow::setupGui() { | ||
| 64 | 73 | textEdit->setReadOnly( true ); |
| 65 | 74 | textEdit->setWordWrapMode( QTextOption::WrapAnywhere ); |
| 66 | 75 | QFont* font = new QFont(); |
| 67 | - font->setPixelSize( 11 ); | |
| 76 | + font->setPixelSize( FONT_SIZE ); | |
| 68 | 77 | textEdit->setFont( *font ); |
| 69 | 78 | |
| 70 | 79 | clearTextButton = new QPushButton( QString::fromUtf8( "クリア" ) ); |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | <RCC> |
| 2 | 2 | <qresource prefix="/"> |
| 3 | - <file>default.qss</file> | |
| 3 | + <file>stylesheet.qss</file> | |
| 4 | 4 | </qresource> |
| 5 | 5 | </RCC> |
| @@ -1,4 +1,8 @@ | ||
| 1 | 1 | 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 | 6 | background-color: gainsboro; |
| 3 | 7 | /* |
| 4 | 8 | background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 whitesmoke, stop: 1 silver); |
Fork