Paste P131

Masterwork From Distant Lands
ActivePublic

Authored by dkazakov on Nov 6 2017, 9:56 AM.
diff --git a/libs/pigment/tests/TestColorBlending.cpp b/libs/pigment/tests/TestColorBlending.cpp
index 1c6e6bd..d03e1a6 100644
--- a/libs/pigment/tests/TestColorBlending.cpp
+++ b/libs/pigment/tests/TestColorBlending.cpp
@@ -10,8 +10,12 @@ void TestColorBlending::test()
//w.show();
//QApplication app();
- TestColorBlendingWindow *demo = new TestColorBlendingWindow;
+ QEventLoop loop;
+
+ TestColorBlendingWindow *demo = new TestColorBlendingWindow();
demo->show();
+
+ loop.exec();
//demo->exec();
}
diff --git a/libs/pigment/tests/TestColorBlending.h b/libs/pigment/tests/TestColorBlending.h
index 15cdf32..dae436d 100644
--- a/libs/pigment/tests/TestColorBlending.h
+++ b/libs/pigment/tests/TestColorBlending.h
@@ -11,11 +11,11 @@ private Q_SLOTS:
void test();
};
-class TestColorBlendingWindow: public QMainWindow, Ui::MainWindow
+class TestColorBlendingWindow: public QDialog, Ui::MainWindow
{
Q_OBJECT
public:
- TestColorBlendingWindow(QMainWindow *parent = 0) : QMainWindow(parent) {
+ TestColorBlendingWindow(QWidget *parent = 0) : QDialog(parent) {
setupUi(this);
}
};
diff --git a/libs/pigment/tests/TestColorBlendingWindow.ui b/libs/pigment/tests/TestColorBlendingWindow.ui
index d89bdce..4b362ec 100644
--- a/libs/pigment/tests/TestColorBlendingWindow.ui
+++ b/libs/pigment/tests/TestColorBlendingWindow.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
+ <widget class="QDialog" name="MainWindow">
<property name="geometry">
<rect>
<x>0</x>
@@ -14,28 +14,16 @@
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralwidget">
- <widget class="QCalendarWidget" name="calendarWidget">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>20</y>
- <width>456</width>
- <height>171</height>
- </rect>
- </property>
- </widget>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QPushButton" name="pushButton">
+ <property name="text">
+ <string>PushButton</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
- <widget class="QMenuBar" name="menubar">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>800</width>
- <height>22</height>
- </rect>
- </property>
- </widget>
- <widget class="QStatusBar" name="statusbar"/>
</widget>
<resources/>
<connections/>
dkazakov edited the content of this paste. (Show Details)Nov 6 2017, 9:56 AM
dkazakov changed the title of this paste from untitled to Masterwork From Distant Lands.
dkazakov updated the paste's language from autodetect to autodetect.