[Jdlraw-discussion] jdlRaw/UI jdlMainWindow.ui, 1.10, 1.11 jdlRememberDialog.ui, 1.1, 1.2
Status: Beta
Brought to you by:
jdla
|
From: Jos De L. <jd...@us...> - 2010-08-07 21:24:56
|
Update of /cvsroot/jdlraw/jdlRaw/UI In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1186/UI Modified Files: jdlMainWindow.ui jdlRememberDialog.ui Log Message: *) Some restyling and theming possibility. Index: jdlRememberDialog.ui =================================================================== RCS file: /cvsroot/jdlraw/jdlRaw/UI/jdlRememberDialog.ui,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** jdlRememberDialog.ui 28 Dec 2009 15:20:40 -0000 1.1 --- jdlRememberDialog.ui 7 Aug 2010 21:24:48 -0000 1.2 *************** *** 1,35 **** ! <ui version="4.0" > <class>jdlRememberDialog</class> ! <widget class="QDialog" name="jdlRememberDialog" > ! <property name="geometry" > <rect> <x>0</x> <y>0</y> <width>718</width> ! <height>622</height> </rect> </property> ! <property name="windowTitle" > <string>Dialog</string> </property> ! <layout class="QVBoxLayout" name="verticalLayout" > <item> ! <widget class="QLabel" name="label" > ! <property name="sizePolicy" > ! <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> ! <property name="contextMenuPolicy" > <enum>Qt::ActionsContextMenu</enum> </property> ! <property name="text" > <string/> </property> ! <property name="pixmap" > ! <pixmap resource="../jdlRaw.qrc" >:/jdlRaw/Icons/Bayer_pattern_on_sensor.svg</pixmap> </property> ! <property name="scaledContents" > <bool>true</bool> </property> --- 1,36 ---- ! <?xml version="1.0" encoding="UTF-8"?> ! <ui version="4.0"> <class>jdlRememberDialog</class> ! <widget class="QDialog" name="jdlRememberDialog"> ! <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>718</width> ! <height>639</height> </rect> </property> ! <property name="windowTitle"> <string>Dialog</string> </property> ! <layout class="QVBoxLayout" name="verticalLayout"> <item> ! <widget class="QLabel" name="label"> ! <property name="sizePolicy"> ! <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> ! <property name="contextMenuPolicy"> <enum>Qt::ActionsContextMenu</enum> </property> ! <property name="text"> <string/> </property> ! <property name="pixmap"> ! <pixmap resource="../jdlRaw.qrc">:/jdlRaw/Icons/Bayer_pattern_on_sensor.svg</pixmap> </property> ! <property name="scaledContents"> <bool>true</bool> </property> *************** *** 37,48 **** </item> <item> ! <widget class="QLabel" name="MessageLabel" > ! <property name="sizePolicy" > ! <sizepolicy vsizetype="Preferred" hsizetype="Preferred" > <horstretch>0</horstretch> <verstretch>1</verstretch> </sizepolicy> </property> ! <property name="text" > <string>The message</string> </property> --- 38,49 ---- </item> <item> ! <widget class="QLabel" name="MessageLabel"> ! <property name="sizePolicy"> ! <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>1</verstretch> </sizepolicy> </property> ! <property name="text"> <string>The message</string> </property> *************** *** 50,60 **** </item> <item> ! <widget class="QComboBox" name="ChoiceBox" /> </item> <item> ! <layout class="QHBoxLayout" name="horizontalLayout" > <item> ! <widget class="QCheckBox" name="DontAskAgainCheck" > ! <property name="text" > <string>Don't ask again</string> </property> --- 51,61 ---- </item> <item> ! <widget class="QComboBox" name="ChoiceBox"/> </item> <item> ! <layout class="QHBoxLayout" name="horizontalLayout"> <item> ! <widget class="QCheckBox" name="DontAskAgainCheck"> ! <property name="text"> <string>Don't ask again</string> </property> *************** *** 62,70 **** </item> <item> ! <spacer name="horizontalSpacer" > ! <property name="orientation" > <enum>Qt::Horizontal</enum> </property> ! <property name="sizeHint" stdset="0" > <size> <width>40</width> --- 63,71 ---- </item> <item> ! <spacer name="horizontalSpacer"> ! <property name="orientation"> <enum>Qt::Horizontal</enum> </property> ! <property name="sizeHint" stdset="0"> <size> <width>40</width> *************** *** 75,83 **** </item> <item> ! <widget class="QPushButton" name="OKButton" > ! <property name="text" > <string>OK</string> </property> ! <property name="default" > <bool>true</bool> </property> --- 76,84 ---- </item> <item> ! <widget class="QPushButton" name="OKButton"> ! <property name="text"> <string>OK</string> </property> ! <property name="default"> <bool>true</bool> </property> *************** *** 87,102 **** </item> <item> ! <layout class="QHBoxLayout" name="horizontalLayout_2" > ! <item> ! <widget class="QLabel" name="ProcessorLabel" > ! <property name="text" > <string>TextLabel</string> </property> </widget> </item> ! <item> ! <widget class="QComboBox" name="ToolConfFileChoice" > ! <property name="sizePolicy" > ! <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <horstretch>0</horstretch> <verstretch>0</verstretch> --- 88,120 ---- </item> <item> ! <layout class="QGridLayout" name="gridLayout"> ! <item row="0" column="0"> ! <widget class="QLabel" name="ProcessorLabel"> ! <property name="text"> <string>TextLabel</string> </property> </widget> </item> ! <item row="0" column="1"> ! <widget class="QComboBox" name="ToolConfFileChoice"> ! <property name="sizePolicy"> ! <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> ! <horstretch>0</horstretch> ! <verstretch>0</verstretch> ! </sizepolicy> ! </property> ! </widget> ! </item> ! <item row="1" column="0"> ! <widget class="QLabel" name="ThemeLabel"> ! <property name="text"> ! <string>TextLabel</string> ! </property> ! </widget> ! </item> ! <item row="1" column="1"> ! <widget class="QComboBox" name="ThemeFileChoice"> ! <property name="sizePolicy"> ! <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> *************** *** 110,114 **** </widget> <resources> ! <include location="../jdlRaw.qrc" /> </resources> <connections/> --- 128,132 ---- </widget> <resources> ! <include location="../jdlRaw.qrc"/> </resources> <connections/> Index: jdlMainWindow.ui =================================================================== RCS file: /cvsroot/jdlraw/jdlRaw/UI/jdlMainWindow.ui,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** jdlMainWindow.ui 18 Jul 2010 08:01:34 -0000 1.10 --- jdlMainWindow.ui 7 Aug 2010 21:24:48 -0000 1.11 *************** *** 52,56 **** </property> <property name="focusPolicy"> ! <enum>Qt::ClickFocus</enum> </property> </widget> --- 52,56 ---- </property> <property name="focusPolicy"> ! <enum>Qt::NoFocus</enum> </property> </widget> *************** *** 155,159 **** </property> <property name="currentIndex"> ! <number>1</number> </property> <widget class="QWidget" name="GenericTab"> --- 155,159 ---- </property> <property name="currentIndex"> ! <number>12</number> </property> <widget class="QWidget" name="GenericTab"> *************** *** 173,183 **** <bool>true</bool> </property> ! <widget class="QWidget" name="scrollAreaWidgetContents_8"> <property name="geometry"> <rect> <x>0</x> <y>0</y> ! <width>291</width> ! <height>597</height> </rect> </property> --- 173,183 ---- <bool>true</bool> </property> ! <widget class="QWidget" name="GenericTabWidget"> <property name="geometry"> <rect> <x>0</x> <y>0</y> ! <width>102</width> ! <height>350</height> </rect> </property> *************** *** 321,343 **** </item> <item> - <widget class="QWidget" name="TB_Fixed_PipeSizeWidget" native="true"> - <layout class="QVBoxLayout" name="verticalLayout_21b"> - <item> - <widget class="QFrame" name="TBC_Fixed_PipeSizeWidget"> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - </widget> - </item> - <item> - <widget class="QWidget" name="PipeSizeWidget" native="true"/> - </item> - </layout> - </widget> - </item> - <item> <spacer name="verticalSpacer_3"> <property name="orientation"> --- 321,324 ---- *************** *** 394,404 **** <bool>true</bool> </property> ! <widget class="QWidget" name="scrollAreaWidgetContents"> <property name="geometry"> <rect> <x>0</x> <y>0</y> ! <width>277</width> ! <height>583</height> </rect> </property> --- 375,385 ---- <bool>true</bool> </property> ! <widget class="QWidget" name="CameraTabWidget"> <property name="geometry"> <rect> <x>0</x> <y>0</y> ! <width>102</width> ! <height>561</height> </rect> </property> *************** *** 601,609 **** <widget class="QWidget" name="InterpolationWidget" native="true"/> </item> - <item> <widget class="QWidget" name="FBDDWidget" native="true"/> </item> - <item> <layout class="QHBoxLayout" name="horizontalLayout_4"> --- 582,588 ---- *************** *** 616,620 **** </layout> </item> - <item> <layout class="QHBoxLayout" name="horizontalLayout_4a"> --- 595,598 ---- *************** *** 630,634 **** </layout> </item> - </layout> </widget> --- 608,611 ---- *************** *** 715,720 **** <x>0</x> <y>0</y> ! <width>291</width> ! <height>597</height> </rect> </property> --- 692,697 ---- <x>0</x> <y>0</y> ! <width>96</width> ! <height>26</height> </rect> </property> *************** *** 753,758 **** <x>0</x> <y>0</y> ! <width>291</width> ! <height>597</height> </rect> </property> --- 730,735 ---- <x>0</x> <y>0</y> ! <width>96</width> ! <height>26</height> </rect> </property> *************** *** 791,796 **** <x>0</x> <y>0</y> ! <width>291</width> ! <height>597</height> </rect> </property> --- 768,773 ---- <x>0</x> <y>0</y> ! <width>96</width> ! <height>26</height> </rect> </property> *************** *** 829,834 **** <x>0</x> <y>0</y> ! <width>291</width> ! <height>597</height> </rect> </property> --- 806,811 ---- <x>0</x> <y>0</y> ! <width>96</width> ! <height>26</height> </rect> </property> *************** *** 867,872 **** <x>0</x> <y>0</y> ! <width>291</width> ! <height>597</height> </rect> </property> --- 844,849 ---- <x>0</x> <y>0</y> ! <width>96</width> ! <height>26</height> </rect> </property> *************** *** 905,910 **** <x>0</x> <y>0</y> ! <width>291</width> ! <height>597</height> </rect> </property> --- 882,887 ---- <x>0</x> <y>0</y> ! <width>96</width> ! <height>26</height> </rect> </property> *************** *** 943,948 **** <x>0</x> <y>0</y> ! <width>291</width> ! <height>597</height> </rect> </property> --- 920,925 ---- <x>0</x> <y>0</y> ! <width>96</width> ! <height>26</height> </rect> </property> *************** *** 981,986 **** <x>0</x> <y>0</y> ! <width>291</width> ! <height>597</height> </rect> </property> --- 958,963 ---- <x>0</x> <y>0</y> ! <width>96</width> ! <height>26</height> </rect> </property> *************** *** 1019,1024 **** <x>0</x> <y>0</y> ! <width>291</width> ! <height>597</height> </rect> </property> --- 996,1001 ---- <x>0</x> <y>0</y> ! <width>96</width> ! <height>26</height> </rect> </property> *************** *** 1057,1062 **** <x>0</x> <y>0</y> ! <width>291</width> ! <height>597</height> </rect> </property> --- 1034,1039 ---- <x>0</x> <y>0</y> ! <width>96</width> ! <height>26</height> </rect> </property> *************** *** 1096,1106 **** <bool>true</bool> </property> ! <widget class="QWidget" name="scrollAreaWidgetContents_7"> <property name="geometry"> <rect> <x>0</x> <y>0</y> ! <width>291</width> ! <height>597</height> </rect> </property> --- 1073,1083 ---- <bool>true</bool> </property> ! <widget class="QWidget" name="InfoTabWidget"> <property name="geometry"> <rect> <x>0</x> <y>0</y> ! <width>305</width> ! <height>601</height> </rect> </property> *************** *** 1255,1258 **** --- 1232,1238 ---- <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> + <widget class="QWidget" name="PipeSizeWidget" native="true"/> + </item> + <item> <widget class="QToolButton" name="ZoomFullButton"> <property name="toolTip"> |