[PC-BSD Commits] r2107 - pcbsd/trunk/CrashHandler
svn at pcbsd.org
svn at pcbsd.org
Tue Jun 17 08:53:31 PDT 2008
Author: kris
Date: 2008-06-17 08:53:21 -0700 (Tue, 17 Jun 2008)
New Revision: 2107
Added:
pcbsd/trunk/CrashHandler/CrashHandler.qrc
pcbsd/trunk/CrashHandler/crashhandler.cpp
pcbsd/trunk/CrashHandler/crashhandler.h
pcbsd/trunk/CrashHandler/details.cpp
pcbsd/trunk/CrashHandler/details.h
Removed:
pcbsd/trunk/CrashHandler/crashhandler.ui.h
pcbsd/trunk/CrashHandler/details.ui.h
Modified:
pcbsd/trunk/CrashHandler/CrashHandler.pro
pcbsd/trunk/CrashHandler/crashhandler.ui
pcbsd/trunk/CrashHandler/details.ui
Log:
Updated CrashHandler to QT4
Modified: pcbsd/trunk/CrashHandler/CrashHandler.pro
===================================================================
--- pcbsd/trunk/CrashHandler/CrashHandler.pro 2008-06-17 15:10:23 UTC (rev 2106)
+++ pcbsd/trunk/CrashHandler/CrashHandler.pro 2008-06-17 15:53:21 UTC (rev 2107)
@@ -6,21 +6,19 @@
TARGET=CrashHandler-bin
DESTDIR=/PCBSD/bin/
-SOURCES += main.cpp
+SOURCES += main.cpp crashhandler.cpp details.cpp
FORMS = crashhandler.ui \
details.ui
+HEADERS += crashhandler.h details.h
+
+RESOURCES = CrashHandler.qrc
+
IMAGES = large_icon.png \
small_icon.png \
save.png
TRANSLATIONS = CrashHandler_en.ts
-unix {
- UI_DIR = .ui
- MOC_DIR = .moc
- OBJECTS_DIR = .obj
-}
-
-
+QT +=qt3support
Added: pcbsd/trunk/CrashHandler/CrashHandler.qrc
Added: pcbsd/trunk/CrashHandler/crashhandler.cpp
Added: pcbsd/trunk/CrashHandler/crashhandler.h
Modified: pcbsd/trunk/CrashHandler/crashhandler.ui
===================================================================
--- pcbsd/trunk/CrashHandler/crashhandler.ui 2008-06-17 15:10:23 UTC (rev 2106)
+++ pcbsd/trunk/CrashHandler/crashhandler.ui 2008-06-17 15:53:21 UTC (rev 2107)
@@ -1,199 +1,212 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>CrashHandler</class>
-<widget class="QDialog">
- <property name="name">
- <cstring>CrashHandler</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>600</width>
- <height>145</height>
- </rect>
- </property>
- <property name="caption">
- <string>PC-BSD Crash Handler</string>
- </property>
- <property name="icon">
- <pixmap>small_icon.png</pixmap>
- </property>
- <grid>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="resizeMode">
- <enum>Fixed</enum>
- </property>
- <widget class="QLabel" row="0" column="1">
- <property name="name">
- <cstring>text</cstring>
- </property>
- <property name="frameShape">
- <enum>NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>Plain</enum>
- </property>
- <property name="text">
- <string>PC-BSD encountered an error while trying to start <b>#</b><br><br>
+<ui version="4.0" >
+ <class>CrashHandler</class>
+ <widget class="QDialog" name="CrashHandler" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>493</width>
+ <height>124</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>PC-BSD Crash Handler</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="icon" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="pixmap" >
+ <pixmap resource="CrashHandler.qrc" >:/large_icon.png</pixmap>
+ </property>
+ <property name="scaledContents" >
+ <bool>true</bool>
+ </property>
+ <property name="wordWrap" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLabel" name="text" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>417</width>
+ <height>71</height>
+ </size>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="text" >
+ <string>PC-BSD encountered an error while trying to start <b>#</b><br><br>
If you often see this message, there is a problem with this application. For more information on this error, click 'Details'.</string>
- </property>
- <property name="alignment">
- <set>WordBreak|AlignVCenter</set>
- </property>
- </widget>
- <widget class="QLabel" row="0" column="0">
- <property name="name">
- <cstring>icon</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="frameShape">
- <enum>NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>Plain</enum>
- </property>
- <property name="pixmap">
- <pixmap>large_icon.png</pixmap>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QFrame" row="1" column="0" rowspan="1" colspan="2">
- <property name="name">
- <cstring>buttonFrame</cstring>
- </property>
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>32767</height>
- </size>
- </property>
- <property name="frameShape">
- <enum>NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>Raised</enum>
- </property>
- <property name="lineWidth">
- <number>0</number>
- </property>
- <grid>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QPushButton" row="0" column="2">
- <property name="name">
- <cstring>closeBut</cstring>
- </property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- <property name="text">
- <string>&Close</string>
- </property>
- <property name="accel">
- <string>Alt+C</string>
- </property>
- <property name="default">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QPushButton" row="0" column="1">
- <property name="name">
- <cstring>detailsBut</cstring>
- </property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- <property name="text">
- <string>&Details...</string>
- </property>
- <property name="accel">
- <string>Alt+D</string>
- </property>
- </widget>
- <spacer row="0" column="0">
- <property name="name">
- <cstring>spacer3</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>366</width>
- <height>31</height>
- </size>
- </property>
- </spacer>
- </grid>
- </widget>
- </grid>
-</widget>
-<connections>
- <connection>
- <sender>closeBut</sender>
- <signal>clicked()</signal>
- <receiver>CrashHandler</receiver>
- <slot>close()</slot>
- </connection>
- <connection>
- <sender>detailsBut</sender>
- <signal>clicked()</signal>
- <receiver>CrashHandler</receiver>
- <slot>showDetails()</slot>
- </connection>
-</connections>
-<includes>
- <include location="global" impldecl="in declaration">details.h</include>
- <include location="global" impldecl="in declaration">qfile.h</include>
- <include location="local" impldecl="in implementation">crashhandler.ui.h</include>
-</includes>
-<variables>
- <variable access="private">QString stderrTxt;</variable>
- <variable access="private">QString stdoutTxt;</variable>
- <variable access="private">Details details;</variable>
-</variables>
-<slots>
- <slot access="private">showDetails()</slot>
-</slots>
-<functions>
- <function>setup( QString name, QString stdout, QString stderr )</function>
-</functions>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2" >
+ <widget class="Q3Frame" name="buttonFrame" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>32767</width>
+ <height>32767</height>
+ </size>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>QFrame::Raised</enum>
+ </property>
+ <property name="lineWidth" >
+ <number>0</number>
+ </property>
+ <layout class="QGridLayout" name="gridLayout" >
+ <item row="0" column="0" >
+ <layout class="QHBoxLayout" name="horizontalLayout_2" >
+ <item>
+ <spacer name="spacer3" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>366</width>
+ <height>31</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="detailsBut" >
+ <property name="minimumSize" >
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string>&Details...</string>
+ </property>
+ <property name="shortcut" >
+ <string>Alt+D</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="closeBut" >
+ <property name="minimumSize" >
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string>&Close</string>
+ </property>
+ <property name="shortcut" >
+ <string>Alt+C</string>
+ </property>
+ <property name="default" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+ <customwidget>
+ <class>Q3Frame</class>
+ <extends>QFrame</extends>
+ <header>Qt3Support/Q3Frame</header>
+ <container>1</container>
+ </customwidget>
+ </customwidgets>
+ <includes>
+ <include location="global" >details.h</include>
+ <include location="global" >qfile.h</include>
+ </includes>
+ <resources>
+ <include location="CrashHandler.qrc" />
+ </resources>
+ <connections>
+ <connection>
+ <sender>closeBut</sender>
+ <signal>clicked()</signal>
+ <receiver>CrashHandler</receiver>
+ <slot>close()</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>
+ <sender>detailsBut</sender>
+ <signal>clicked()</signal>
+ <receiver>CrashHandler</receiver>
+ <slot>showDetails()</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>
+</ui>
Deleted: pcbsd/trunk/CrashHandler/crashhandler.ui.h
Added: pcbsd/trunk/CrashHandler/details.cpp
Added: pcbsd/trunk/CrashHandler/details.h
Modified: pcbsd/trunk/CrashHandler/details.ui
===================================================================
--- pcbsd/trunk/CrashHandler/details.ui 2008-06-17 15:10:23 UTC (rev 2106)
+++ pcbsd/trunk/CrashHandler/details.ui 2008-06-17 15:53:21 UTC (rev 2107)
@@ -1,181 +1,167 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>Details</class>
-<widget class="QDialog">
- <property name="name">
- <cstring>Details</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>708</width>
- <height>528</height>
- </rect>
- </property>
- <property name="caption">
- <string>Crash Details...</string>
- </property>
- <property name="icon">
- <pixmap>small_icon.png</pixmap>
- </property>
- <property name="modal">
- <bool>true</bool>
- </property>
- <grid>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel" row="2" column="0">
- <property name="name">
- <cstring>stderrLbl</cstring>
- </property>
- <property name="frameShape">
- <enum>NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>Plain</enum>
- </property>
- <property name="text">
- <string>Captured from Stderr:</string>
- </property>
- </widget>
- <widget class="QLabel" row="0" column="0">
- <property name="name">
- <cstring>stdoutLbl</cstring>
- </property>
- <property name="frameShape">
- <enum>NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>Plain</enum>
- </property>
- <property name="text">
- <string>Captured from Stdout:</string>
- </property>
- </widget>
- <widget class="QPushButton" row="4" column="1">
- <property name="name">
- <cstring>saveBut</cstring>
- </property>
- <property name="text">
- <string>&Save</string>
- </property>
- <property name="accel">
- <string>Alt+S</string>
- </property>
- <property name="iconSet">
- <iconset>save.png</iconset>
- </property>
- </widget>
- <widget class="QPushButton" row="4" column="2">
- <property name="name">
- <cstring>closeBut</cstring>
- </property>
- <property name="text">
- <string>&Close</string>
- </property>
- <property name="accel">
- <string>Alt+C</string>
- </property>
- <property name="default">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QTextEdit" row="1" column="0" rowspan="1" colspan="3">
- <property name="name">
- <cstring>stdoutBox</cstring>
- </property>
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="paletteForegroundColor">
- <color>
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </property>
- <property name="paletteBackgroundColor">
- <color>
- <red>255</red>
- <green>251</green>
- <blue>220</blue>
- </color>
- </property>
- </widget>
- <widget class="QTextEdit" row="3" column="0" rowspan="1" colspan="3">
- <property name="name">
- <cstring>stderrBox</cstring>
- </property>
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="paletteForegroundColor">
- <color>
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </property>
- <property name="paletteBackgroundColor">
- <color>
- <red>255</red>
- <green>223</green>
- <blue>216</blue>
- </color>
- </property>
- </widget>
- <spacer row="4" column="0">
- <property name="name">
- <cstring>spacer3</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>481</width>
- <height>30</height>
- </size>
- </property>
- </spacer>
- </grid>
-</widget>
-<connections>
- <connection>
- <sender>closeBut</sender>
- <signal>clicked()</signal>
- <receiver>Details</receiver>
- <slot>close()</slot>
- </connection>
- <connection>
- <sender>saveBut</sender>
- <signal>clicked()</signal>
- <receiver>Details</receiver>
- <slot>saveOutput()</slot>
- </connection>
-</connections>
-<tabstops>
- <tabstop>stdoutBox</tabstop>
- <tabstop>stderrBox</tabstop>
- <tabstop>saveBut</tabstop>
- <tabstop>closeBut</tabstop>
-</tabstops>
-<includes>
- <include location="global" impldecl="in declaration">qfiledialog.h</include>
- <include location="global" impldecl="in declaration">qfile.h</include>
- <include location="global" impldecl="in declaration">qmessagebox.h</include>
- <include location="local" impldecl="in implementation">details.ui.h</include>
-</includes>
-<slots>
- <slot access="private">saveOutput()</slot>
-</slots>
-<functions>
- <function>populate( QString stdout, QString stderr )</function>
-</functions>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+<ui version="4.0" >
+ <class>Details</class>
+ <widget class="QDialog" name="Details" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>708</width>
+ <height>528</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>Crash Details...</string>
+ </property>
+ <property name="modal" >
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="stdoutLbl" >
+ <property name="frameShape" >
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="text" >
+ <string>Captured from Stdout:</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="3" >
+ <widget class="Q3TextEdit" name="stdoutBox" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="stderrLbl" >
+ <property name="frameShape" >
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="text" >
+ <string>Captured from Stderr:</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" colspan="3" >
+ <widget class="Q3TextEdit" name="stderrBox" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0" >
+ <spacer name="spacer3" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>481</width>
+ <height>30</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="4" column="1" >
+ <widget class="QPushButton" name="saveBut" >
+ <property name="text" >
+ <string>&Save</string>
+ </property>
+ <property name="icon" >
+ <iconset resource="CrashHandler.qrc" >
+ <normaloff>:/save.png</normaloff>:/save.png</iconset>
+ </property>
+ <property name="shortcut" >
+ <string>Alt+S</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="2" >
+ <widget class="QPushButton" name="closeBut" >
+ <property name="text" >
+ <string>&Close</string>
+ </property>
+ <property name="shortcut" >
+ <string>Alt+C</string>
+ </property>
+ <property name="default" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+ <customwidget>
+ <class>Q3TextEdit</class>
+ <extends>Q3Frame</extends>
+ <header>q3textedit.h</header>
+ </customwidget>
+ </customwidgets>
+ <tabstops>
+ <tabstop>stdoutBox</tabstop>
+ <tabstop>stderrBox</tabstop>
+ <tabstop>saveBut</tabstop>
+ <tabstop>closeBut</tabstop>
+ </tabstops>
+ <includes>
+ <include location="global" >q3filedialog.h</include>
+ <include location="global" >qfile.h</include>
+ <include location="global" >qmessagebox.h</include>
+ </includes>
+ <resources>
+ <include location="CrashHandler.qrc" />
+ </resources>
+ <connections>
+ <connection>
+ <sender>closeBut</sender>
+ <signal>clicked()</signal>
+ <receiver>Details</receiver>
+ <slot>close()</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>
+ <sender>saveBut</sender>
+ <signal>clicked()</signal>
+ <receiver>Details</receiver>
+ <slot>saveOutput()</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>
+</ui>
Deleted: pcbsd/trunk/CrashHandler/details.ui.h
More information about the Commits
mailing list