• R/O
  • HTTP
  • SSH
  • HTTPS

提交

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

百人一首かるた 流しの練習用


Commit MetaInfo

修訂6a6eb3b664d31fed3f42d65ed348c59658c83676 (tree)
時間2015-11-14 16:51:31
作者alucky4416 <alucky4416@user...>
Commiteralucky4416

Log Message

support Qt5

Change Summary

差異

--- a/QtKarutaNagashi.pro
+++ b/QtKarutaNagashi.pro
@@ -4,7 +4,7 @@
44 #
55 #-------------------------------------------------
66
7-QT += core gui
7+QT += widgets
88
99 TARGET = QtKarutaNagashi
1010 TEMPLATE = app
--- a/fudaimgview.cpp
+++ b/fudaimgview.cpp
@@ -1,7 +1,5 @@
11 #include "fudaimgview.h"
22
3-#include <QDebug>
4-
53 FudaImgView::FudaImgView(QWidget *parent) :
64 QGraphicsView(parent)
75 {
--- a/fudaimgview.h
+++ b/fudaimgview.h
@@ -1,7 +1,7 @@
11 #ifndef FUDAIMGVIEW_H
22 #define FUDAIMGVIEW_H
33
4-#include <QtGui>
4+#include <QGraphicsView>
55
66 class FudaImgView : public QGraphicsView
77 {
--- a/main.cpp
+++ b/main.cpp
@@ -1,4 +1,4 @@
1-#include <QtGui/QApplication>
1+#include <QApplication>
22 #include "mainwindow.h"
33
44 int main(int argc, char *argv[])
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3,6 +3,11 @@
33 #include "textrsc.h"
44
55 #include <QDebug>
6+
7+#include <QMessageBox>
8+#include <QTime>
9+#include <QTimer>
10+
611 #include <QTextCodec>
712
813 int RandomNumber(int min, int max)
@@ -36,7 +41,7 @@ MainWindow::MainWindow(QWidget *parent) :
3641 ui->setupUi(this);
3742
3843 // QTextCodec::setCodecForTr(QTextCodec::codecForLocale());
39- QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); // source codec is UTF-8
44+// QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); // source codec is UTF-8
4045
4146 ui->Slct_Mode->addItem(tr("自動"));
4247 ui->Slct_Mode->addItem(tr("手動"));
@@ -262,7 +267,7 @@ void MainWindow::on_actionExit_triggered()
262267
263268 void MainWindow::on_actionAbout_triggered()
264269 {
265- QMessageBox::about(this, "About", tr("流しの練習 v0.3"));
270+ QMessageBox::about(this, "About", tr("流しの練習 v0.4"));
266271 }
267272
268273 void MainWindow::on_actionAbout_Qt_triggered()
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -3,7 +3,9 @@
33
44 #include <QMainWindow>
55
6-#include <QtGui>
6+#include <QGraphicsScene>
7+#include <QGraphicsView>
8+#include <QGraphicsItem>
79
810 namespace Ui {
911 class MainWindow;
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -90,6 +90,9 @@ p, li { white-space: pre-wrap; }
9090 <property name="alignment">
9191 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
9292 </property>
93+ <property name="decimals">
94+ <number>1</number>
95+ </property>
9396 <property name="minimum">
9497 <double>0.100000000000000</double>
9598 </property>
@@ -164,7 +167,7 @@ p, li { white-space: pre-wrap; }
164167 <property name="geometry">
165168 <rect>
166169 <x>360</x>
167- <y>40</y>
170+ <y>30</y>
168171 <width>221</width>
169172 <height>291</height>
170173 </rect>
@@ -213,7 +216,7 @@ p, li { white-space: pre-wrap; }
213216 <property name="geometry">
214217 <rect>
215218 <x>362</x>
216- <y>20</y>
219+ <y>10</y>
217220 <width>211</width>
218221 <height>20</height>
219222 </rect>
@@ -271,8 +274,8 @@ p, li { white-space: pre-wrap; }
271274 <property name="geometry">
272275 <rect>
273276 <x>360</x>
274- <y>330</y>
275- <width>221</width>
277+ <y>320</y>
278+ <width>231</width>
276279 <height>16</height>
277280 </rect>
278281 </property>
@@ -320,7 +323,7 @@ p, li { white-space: pre-wrap; }
320323 <property name="geometry">
321324 <rect>
322325 <x>340</x>
323- <y>40</y>
326+ <y>30</y>
324327 <width>21</width>
325328 <height>291</height>
326329 </rect>
@@ -438,7 +441,7 @@ p, li { white-space: pre-wrap; }
438441 <x>0</x>
439442 <y>0</y>
440443 <width>600</width>
441- <height>22</height>
444+ <height>25</height>
442445 </rect>
443446 </property>
444447 <widget class="QMenu" name="menuFile">