• 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

Revision851996e39b392153ff2315d546b73733f3f5eaf6 (tree)
Zeit2014-04-13 22:36:08
Autorjakago <jakago777@gmai...>
Commiterjakago

Log Message

GUI変更中

Ändern Zusammenfassung

Diff

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,26 +6,26 @@
66 <rect>
77 <x>0</x>
88 <y>0</y>
9- <width>500</width>
10- <height>420</height>
9+ <width>540</width>
10+ <height>500</height>
1111 </rect>
1212 </property>
1313 <property name="sizePolicy">
14- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
14+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
1515 <horstretch>0</horstretch>
1616 <verstretch>0</verstretch>
1717 </sizepolicy>
1818 </property>
1919 <property name="minimumSize">
2020 <size>
21- <width>500</width>
22- <height>420</height>
21+ <width>540</width>
22+ <height>500</height>
2323 </size>
2424 </property>
2525 <property name="maximumSize">
2626 <size>
27- <width>500</width>
28- <height>420</height>
27+ <width>540</width>
28+ <height>500</height>
2929 </size>
3030 </property>
3131 <property name="font">
@@ -48,8 +48,8 @@
4848 <rect>
4949 <x>10</x>
5050 <y>10</y>
51- <width>481</width>
52- <height>361</height>
51+ <width>521</width>
52+ <height>437</height>
5353 </rect>
5454 </property>
5555 <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 @@
10471047 <rect>
10481048 <x>0</x>
10491049 <y>0</y>
1050- <width>500</width>
1050+ <width>540</width>
10511051 <height>22</height>
10521052 </rect>
10531053 </property>
--- a/messagewindow.cpp
+++ b/messagewindow.cpp
@@ -32,8 +32,17 @@
3232 namespace {
3333 const QString SETTING_GROUP( "MessageWindow" );
3434 const QString SETTING_GEOMETRY( "geometry" );
35- const int DEFAULT_WIDTH = 500;
35+ const int DEFAULT_WIDTH = 540;
3636 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
3746 }
3847
3948 MessageWindow::MessageWindow(QWidget *parent) :
@@ -64,7 +73,7 @@ void MessageWindow::setupGui() {
6473 textEdit->setReadOnly( true );
6574 textEdit->setWordWrapMode( QTextOption::WrapAnywhere );
6675 QFont* font = new QFont();
67- font->setPixelSize( 11 );
76+ font->setPixelSize( FONT_SIZE );
6877 textEdit->setFont( *font );
6978
7079 clearTextButton = new QPushButton( QString::fromUtf8( "クリア" ) );
--- a/stylesheet.qrc
+++ b/stylesheet.qrc
@@ -1,5 +1,5 @@
11 <RCC>
22 <qresource prefix="/">
3- <file>default.qss</file>
3+ <file>stylesheet.qss</file>
44 </qresource>
55 </RCC>
--- a/stylesheet.qss
+++ b/stylesheet.qss
@@ -1,4 +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;
26 background-color: gainsboro;
37 /*
48 background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 whitesmoke, stop: 1 silver);