Resize changes on newer qt versions draft
authorMarkus Bröker <mbroeker@largo.homelinux.org>
Tue, 02 Feb 2010 13:20:45 +0100
changeset 7 f23b595e590e
parent 6 acfe33bf1dcc
child 8 6097dc1fe2cf
Resize changes on newer qt versions
.ui/monitor.ui
debian/changelog
monitor.cpp
--- a/.ui/monitor.ui
+++ b/.ui/monitor.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>qMonitor</class>
- <widget class="QDialog" name="qMonitor" >
-  <property name="geometry" >
+ <widget class="QDialog" name="qMonitor">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,87 +10,60 @@
     <height>520</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Monitor</string>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
-   <property name="leftMargin" >
-    <number>9</number>
-   </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
+   <property name="margin">
     <number>9</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</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" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
         <number>6</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" >
+       <property name="margin">
         <number>0</number>
        </property>
        <item>
-        <widget class="QLabel" name="label" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Expanding" hsizetype="Ignored" >
+        <widget class="QLabel" name="label">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Ignored" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="text" >
+         <property name="text">
           <string/>
          </property>
-         <property name="pixmap" >
+         <property name="pixmap">
           <pixmap>../../../../../../usr/share/pixmaps/qMonitor_sideBar.png</pixmap>
          </property>
-         <property name="scaledContents" >
+         <property name="scaledContents">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QListWidget" name="listWidget1" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+        <widget class="QListWidget" name="listWidget1">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="minimumSize" >
+         <property name="minimumSize">
           <size>
            <width>110</width>
            <height>100</height>
@@ -98,9 +72,9 @@
         </widget>
        </item>
        <item>
-        <widget class="QLineEdit" name="lineEdit1" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+        <widget class="QLineEdit" name="lineEdit1">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -110,25 +84,16 @@
       </layout>
      </item>
      <item>
-      <layout class="QVBoxLayout" >
-       <property name="spacing" >
+      <layout class="QVBoxLayout">
+       <property name="spacing">
         <number>6</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" >
+       <property name="margin">
         <number>0</number>
        </property>
        <item>
-        <widget class="QTextEdit" name="textEdit" >
-         <property name="font" >
+        <widget class="QTextEdit" name="textEdit">
+         <property name="font">
           <font>
            <family>Monospace</family>
            <pointsize>9</pointsize>
@@ -139,57 +104,49 @@
            <strikeout>false</strikeout>
           </font>
          </property>
-         <property name="autoFormatting" >
+         <property name="autoFormatting">
           <set>QTextEdit::AutoNone</set>
          </property>
-         <property name="lineWrapMode" >
-          <enum>QTextEdit::WidgetWidth</enum>
+         <property name="lineWrapMode">
+          <enum>QTextEdit::NoWrap</enum>
          </property>
-         <property name="html" >
-          <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+         <property name="html">
+          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Monospace'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Monospace'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
-         <property name="acceptRichText" >
+         <property name="acceptRichText">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item>
-        <layout class="QHBoxLayout" >
-         <property name="spacing" >
+        <layout class="QHBoxLayout">
+         <property name="spacing">
           <number>6</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" >
+         <property name="margin">
           <number>0</number>
          </property>
          <item>
-          <widget class="QPushButton" name="pushButton1" >
-           <property name="text" >
+          <widget class="QPushButton" name="pushButton1">
+           <property name="text">
             <string>Start</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="pushButton2" >
-           <property name="text" >
+          <widget class="QPushButton" name="pushButton2">
+           <property name="text">
             <string>Stop</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="pushButton3" >
-           <property name="text" >
+          <widget class="QPushButton" name="pushButton3">
+           <property name="text">
             <string>Beenden</string>
            </property>
           </widget>
@@ -218,11 +175,11 @@
    <receiver>qMonitor</receiver>
    <slot>close()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>679</x>
      <y>536</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>153</x>
      <y>171</y>
     </hint>
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,5 +3,7 @@
   * Initial release
   * header checks
   * lintian checks
+  * resize inconsistency on newer qt versions
 
- -- Markus Bröker <mbroeker@largo.homelinux.org>  Fri, 07 Mar 2008 00:36:15 +0100
+ -- Markus Bröker <mbroeker@largo.homelinux.org>  Thu, 20 Aug 2009 21:11:00 +0200
+
--- a/monitor.cpp
+++ b/monitor.cpp
@@ -17,7 +17,8 @@
 "<li>W&auml;hlen Sie einen Port (0=ALLE)</li>" \
 "<li>Dr&uuml;cken Sie Start</li>" \
 "<br><br>" \
-"<h5>Dieses Programm zeigt den Traffic im Netz an und unterst&uuml;tzt Sie bei t&auml;glichen Aufgaben:</h5><br><br>" \
+"<h5>Dieses Programm zeigt den Traffic im Netz an<br>" \
+"und unterst&uuml;tzt Sie bei t&auml;glichen Aufgaben:</h5><br><br>" \
 "<li>Kontrolle der TCP/UDP Verbindungen</li>" \
 "<li>&Uuml;berwachung von textbasierten Serverdiensten</li>" \
 "<li>Protokollanalyse</li>" \