bugfix 2594,2573

This commit is contained in:
2008-05-25 14:43:22 +00:00
parent 848bc7b926
commit 2317f5d169
4 changed files with 87 additions and 126 deletions
+2 -2
View File
@@ -9,7 +9,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>741</width> <width>741</width>
<height>756</height> <height>719</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
@@ -165,7 +165,7 @@
</widget> </widget>
<widget class="QMenu" name="menuWindow" > <widget class="QMenu" name="menuWindow" >
<property name="title" > <property name="title" >
<string>Windows</string> <string>Window</string>
</property> </property>
</widget> </widget>
<addaction name="fileMenu" /> <addaction name="fileMenu" />
+1
View File
@@ -1461,6 +1461,7 @@ void FWWindow::minimizeAll ()
QList<QMdiSubWindow *> subWindowList = m_space->subWindowList(); QList<QMdiSubWindow *> subWindowList = m_space->subWindowList();
for (int i = 0 ; i < subWindowList.size();i++) for (int i = 0 ; i < subWindowList.size();i++)
{ {
if (!subWindowList[i]->isMinimized())
subWindowList[i]->showMinimized (); subWindowList[i]->showMinimized ();
} }
} }
+81 -121
View File
@@ -8,8 +8,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>572</width> <width>617</width>
<height>182</height> <height>201</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
@@ -186,33 +186,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" >
<widget class="QTextEdit" name="comment" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>100</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="tabChangesFocus" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QFrame" name="frame14" > <widget class="QFrame" name="frame14" >
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
<width>350</width> <width>250</width>
<height>16</height> <height>16</height>
</size> </size>
</property> </property>
<property name="maximumSize" >
<size>
<width>250</width>
<height>16777215</height>
</size>
</property>
<property name="frameShape" > <property name="frameShape" >
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
@@ -248,7 +235,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" colspan="3" > <item row="0" column="1" >
<widget class="QLineEdit" name="obj_name" > <widget class="QLineEdit" name="obj_name" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" > <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -258,7 +245,7 @@
</property> </property>
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
<width>250</width> <width>170</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@@ -274,7 +261,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="3" > <item row="1" column="1" >
<widget class="QComboBox" name="libs" > <widget class="QComboBox" name="libs" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" > <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -294,7 +281,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="3" > <item row="2" column="1" >
<widget class="QLineEdit" name="address" > <widget class="QLineEdit" name="address" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" > <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -308,83 +295,90 @@
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2" > <item row="3" column="0" colspan="2" >
<widget class="QLabel" name="netmaskLabel" > <widget class="QFrame" name="frame" >
<property name="text" > <property name="frameShape" >
<string>Network (bit length)</string> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="wordWrap" > <property name="frameShadow" >
<bool>false</bool> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="netmaskLabel" >
<property name="text" >
<string>Network (bit length)</string>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLineEdit" name="netmask" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="3" column="2" > <item row="4" column="0" colspan="2" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" >
<size> <size>
<width>40</width> <width>232</width>
<height>20</height> <height>31</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="3" column="3" >
<widget class="QLineEdit" name="netmask" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="4" column="0" colspan="4" >
<layout class="QHBoxLayout" >
<property name="spacing" >
<number>2</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>30</width>
<height>5</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="dnsLookup" >
<property name="text" >
<string>DNS Lookup...</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="1" >
<widget class="QTextEdit" name="comment" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>100</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="tabChangesFocus" >
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@@ -397,8 +391,6 @@
<tabstop>obj_name</tabstop> <tabstop>obj_name</tabstop>
<tabstop>libs</tabstop> <tabstop>libs</tabstop>
<tabstop>address</tabstop> <tabstop>address</tabstop>
<tabstop>netmask</tabstop>
<tabstop>dnsLookup</tabstop>
<tabstop>comment</tabstop> <tabstop>comment</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
@@ -451,22 +443,6 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>netmask</sender>
<signal>textChanged(QString)</signal>
<receiver>IPv6Dialog_q</receiver>
<slot>changed()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection> <connection>
<sender>obj_name</sender> <sender>obj_name</sender>
<signal>textChanged(QString)</signal> <signal>textChanged(QString)</signal>
@@ -483,21 +459,5 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>dnsLookup</sender>
<signal>clicked()</signal>
<receiver>IPv6Dialog_q</receiver>
<slot>DNSlookup()</slot>
<hints>
<hint type="sourcelabel" >
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel" >
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
</connections> </connections>
</ui> </ui>
+3 -3
View File
@@ -8,8 +8,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>620</width> <width>614</width>
<height>208</height> <height>197</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
@@ -375,7 +375,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="4" column="1" > <item row="4" column="0" colspan="2" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>