Fixed #1647: help dialog is not system-modal now

This commit is contained in:
Roman Bovsunivskiy
2010-07-30 17:39:34 +00:00
parent 24b2b690e1
commit ca909d305a
2 changed files with 36 additions and 32 deletions
+2 -2
View File
@@ -77,10 +77,10 @@ Help::~Help()
delete m_dialog;
}
Help* Help::getHelpWindow(QWidget*)
Help* Help::getHelpWindow(QWidget* w)
{
if (help_window == NULL)
help_window = new Help(NULL, "Firewall Builder");
help_window = new Help(w, "Firewall Builder");
//if (parent != mw) help_window->setParent(parent, help_window->flags);
return help_window;
+34 -30
View File
@@ -1,7 +1,11 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>HelpView_q</class>
<widget class="QMainWindow" name="HelpView_q" >
<property name="geometry" >
<widget class="QMainWindow" name="HelpView_q">
<property name="windowModality">
<enum>Qt::ApplicationModal</enum>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,32 +13,32 @@
<height>639</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>MainWindow</string>
</property>
<widget class="QWidget" name="centralwidget" >
<layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" >
<widget class="QFrame" name="frame" >
<property name="frameShape" >
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2" >
<item row="0" column="0" >
<widget class="QLabel" name="objectname" >
<property name="font" >
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="objectname">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<property name="text">
<string>Object Name</string>
</property>
<property name="wordWrap" >
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
@@ -42,17 +46,17 @@
</layout>
</widget>
</item>
<item row="1" column="0" >
<widget class="QTextBrowser" name="textview" />
<item row="1" column="0">
<widget class="QTextBrowser" name="textview"/>
</item>
<item row="2" column="0" >
<layout class="QHBoxLayout" name="horizontalLayout" >
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer" >
<property name="orientation" >
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@@ -61,8 +65,8 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="closeButton" >
<property name="text" >
<widget class="QPushButton" name="closeButton">
<property name="text">
<string>Close</string>
</property>
</widget>
@@ -71,8 +75,8 @@
</item>
</layout>
</widget>
<widget class="QMenuBar" name="menubar" >
<property name="geometry" >
<widget class="QMenuBar" name="menubar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -81,7 +85,7 @@
</rect>
</property>
</widget>
<widget class="QStatusBar" name="statusbar" />
<widget class="QStatusBar" name="statusbar"/>
</widget>
<resources/>
<connections>
@@ -91,11 +95,11 @@
<receiver>HelpView_q</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel" >
<hint type="sourcelabel">
<x>418</x>
<y>588</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>234</x>
<y>319</y>
</hint>