Menu
▾
▴
[Quickrip-cvs] quickrip/testing guisettings-hig-tom.ui,1.2,1.3
|
From: <te...@us...> - 2003-08-01 18:23:05
|
Update of /cvsroot/quickrip/quickrip/testing
In directory sc8-pr-cvs1:/tmp/cvs-serv10915/testing
Modified Files:
guisettings-hig-tom.ui
Log Message:
Minor changes, renaming of UI objects so the UI file can be used in
code, removal of "save" button
Index: guisettings-hig-tom.ui
===================================================================
RCS file: /cvsroot/quickrip/quickrip/testing/guisettings-hig-tom.ui,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** guisettings-hig-tom.ui 1 Aug 2003 17:43:24 -0000 1.2
--- guisettings-hig-tom.ui 1 Aug 2003 18:23:02 -0000 1.3
***************
*** 78,82 ****
<widget class="QPushButton">
<property name="name">
! <cstring>buttonHelp</cstring>
</property>
<property name="enabled">
--- 78,82 ----
<widget class="QPushButton">
<property name="name">
! <cstring>b_Help</cstring>
</property>
<property name="enabled">
***************
*** 115,142 ****
<widget class="QPushButton">
<property name="name">
! <cstring>buttonOk_3</cstring>
! </property>
! <property name="text">
! <string>&Save as defaults</string>
! </property>
! <property name="accel">
! <string>Alt+S</string>
! </property>
! <property name="autoDefault">
! <bool>true</bool>
! </property>
! <property name="default">
! <bool>true</bool>
! </property>
! <property name="iconSet">
! <iconset>image2</iconset>
! </property>
! <property name="toolTip" stdset="0">
! <string>Save settings as defaults for next session</string>
! </property>
! </widget>
! <widget class="QPushButton">
! <property name="name">
! <cstring>buttonOk_2</cstring>
</property>
<property name="text">
--- 115,119 ----
<widget class="QPushButton">
<property name="name">
! <cstring>b_Ok</cstring>
</property>
<property name="text">
***************
*** 153,157 ****
</property>
<property name="iconSet">
! <iconset>image3</iconset>
</property>
<property name="toolTip" stdset="0">
--- 130,134 ----
</property>
<property name="iconSet">
! <iconset>image2</iconset>
</property>
<property name="toolTip" stdset="0">
***************
*** 161,165 ****
<widget class="QPushButton">
<property name="name">
! <cstring>buttonOk</cstring>
</property>
<property name="text">
--- 138,142 ----
<widget class="QPushButton">
<property name="name">
! <cstring>b_Cancel</cstring>
</property>
<property name="text">
***************
*** 176,180 ****
</property>
<property name="iconSet">
! <iconset>image4</iconset>
</property>
<property name="toolTip" stdset="0">
--- 153,157 ----
</property>
<property name="iconSet">
! <iconset>image3</iconset>
</property>
<property name="toolTip" stdset="0">
***************
*** 201,205 ****
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
! <cstring>textLabel1_3</cstring>
</property>
<property name="sizePolicy">
--- 178,182 ----
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
! <cstring>l_generalsettings</cstring>
</property>
<property name="sizePolicy">
***************
*** 244,248 ****
<widget class="QLabel" row="0" column="0">
<property name="name">
! <cstring>textLabel2_2</cstring>
</property>
<property name="text">
--- 221,225 ----
<widget class="QLabel" row="0" column="0">
<property name="name">
! <cstring>l_logginglevel</cstring>
</property>
<property name="text">
***************
*** 252,256 ****
<widget class="QLabel" row="1" column="0">
<property name="name">
! <cstring>textLabel3_2</cstring>
</property>
<property name="text">
--- 229,233 ----
<widget class="QLabel" row="1" column="0">
<property name="name">
! <cstring>l_logfile</cstring>
</property>
<property name="text">
***************
*** 265,269 ****
</item>
<property name="name">
! <cstring>comboBox17_4</cstring>
</property>
<property name="sizePolicy">
--- 242,246 ----
</item>
<property name="name">
! <cstring>logFileLocation</cstring>
</property>
<property name="sizePolicy">
***************
*** 305,314 ****
</item>
<property name="name">
! <cstring>comboBox17_3</cstring>
</property>
</widget>
<widget class="QPushButton" row="1" column="2">
<property name="name">
! <cstring>b_browseMPlayer_2_2</cstring>
</property>
<property name="text">
--- 282,291 ----
</item>
<property name="name">
! <cstring>loggingLevel</cstring>
</property>
</widget>
<widget class="QPushButton" row="1" column="2">
<property name="name">
! <cstring>b_browseLogFile</cstring>
</property>
<property name="text">
***************
*** 343,347 ****
<widget class="QLabel" row="2" column="0">
<property name="name">
! <cstring>textLabel1</cstring>
</property>
<property name="text">
--- 320,324 ----
<widget class="QLabel" row="2" column="0">
<property name="name">
! <cstring>l_logging</cstring>
</property>
<property name="text">
***************
*** 351,355 ****
<widget class="QLabel" row="5" column="0">
<property name="name">
! <cstring>textLabel1_4</cstring>
</property>
<property name="text">
--- 328,332 ----
<widget class="QLabel" row="5" column="0">
<property name="name">
! <cstring>l_audio</cstring>
</property>
<property name="text">
***************
*** 400,404 ****
<widget class="QLabel" row="1" column="0">
<property name="name">
! <cstring>textLabel3_3_5</cstring>
</property>
<property name="sizePolicy">
--- 377,381 ----
<widget class="QLabel" row="1" column="0">
<property name="name">
! <cstring>l_quality</cstring>
</property>
<property name="sizePolicy">
***************
*** 491,495 ****
</item>
<property name="name">
! <cstring>volume_4</cstring>
</property>
<property name="currentItem">
--- 468,472 ----
</item>
<property name="name">
! <cstring>volume</cstring>
</property>
<property name="currentItem">
***************
*** 527,531 ****
</item>
<property name="name">
! <cstring>audioBitRate_4</cstring>
</property>
<property name="sizePolicy">
--- 504,508 ----
</item>
<property name="name">
! <cstring>audioBitRate</cstring>
</property>
<property name="sizePolicy">
***************
*** 546,550 ****
<widget class="QLabel" row="0" column="0">
<property name="name">
! <cstring>textLabel3_2_2_4</cstring>
</property>
<property name="sizePolicy">
--- 523,527 ----
<widget class="QLabel" row="0" column="0">
<property name="name">
! <cstring>l_volume</cstring>
</property>
<property name="sizePolicy">
***************
*** 611,615 ****
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
! <cstring>textLabel1_3_2</cstring>
</property>
<property name="sizePolicy">
--- 588,592 ----
<widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
! <cstring>l_setpaths</cstring>
</property>
<property name="sizePolicy">
***************
*** 664,668 ****
</item>
<property name="name">
! <cstring>comboBox17_2_3_2</cstring>
</property>
<property name="sizePolicy">
--- 641,645 ----
</item>
<property name="name">
! <cstring>outputDir</cstring>
</property>
<property name="sizePolicy">
***************
*** 689,693 ****
<widget class="QPushButton">
<property name="name">
! <cstring>b_selectOutputDir_2</cstring>
</property>
<property name="text">
--- 666,670 ----
<widget class="QPushButton">
<property name="name">
! <cstring>b_selectOutputDir</cstring>
</property>
<property name="text">
***************
*** 737,741 ****
</item>
<property name="name">
! <cstring>comboBox17_2</cstring>
</property>
<property name="sizePolicy">
--- 714,718 ----
</item>
<property name="name">
! <cstring>mencoder</cstring>
</property>
<property name="sizePolicy">
***************
*** 762,766 ****
<widget class="QPushButton" row="2" column="2">
<property name="name">
! <cstring>b_browseMencoder_2</cstring>
</property>
<property name="text">
--- 739,743 ----
<widget class="QPushButton" row="2" column="2">
<property name="name">
! <cstring>b_browseMencoder</cstring>
</property>
<property name="text">
***************
*** 795,799 ****
<widget class="QPushButton" row="1" column="2">
<property name="name">
! <cstring>b_browseTcprobe_2</cstring>
</property>
<property name="text">
--- 772,776 ----
<widget class="QPushButton" row="1" column="2">
<property name="name">
! <cstring>b_browseTcprobe</cstring>
</property>
<property name="text">
***************
*** 833,837 ****
</item>
<property name="name">
! <cstring>comboBox17_2_2</cstring>
</property>
<property name="sizePolicy">
--- 810,814 ----
</item>
<property name="name">
! <cstring>tcprobe</cstring>
</property>
<property name="sizePolicy">
***************
*** 858,862 ****
<widget class="QPushButton" row="0" column="2">
<property name="name">
! <cstring>b_browseMPlayer_2</cstring>
</property>
<property name="text">
--- 835,839 ----
<widget class="QPushButton" row="0" column="2">
<property name="name">
! <cstring>b_browseMPlayer</cstring>
</property>
<property name="text">
***************
*** 904,908 ****
<widget class="QLabel" row="2" column="0">
<property name="name">
! <cstring>textLabel1_5</cstring>
</property>
<property name="text">
--- 881,885 ----
<widget class="QLabel" row="2" column="0">
<property name="name">
! <cstring>l_directories</cstring>
</property>
<property name="text">
***************
*** 946,950 ****
<widget class="QLabel" row="5" column="0">
<property name="name">
! <cstring>textLabel1_5_2</cstring>
</property>
<property name="text">
--- 923,927 ----
<widget class="QLabel" row="5" column="0">
<property name="name">
! <cstring>l_programs</cstring>
</property>
<property name="text">
***************
*** 1003,1007 ****
</item>
<property name="name">
! <cstring>comboBox17_2_3</cstring>
</property>
<property name="sizePolicy">
--- 980,984 ----
</item>
<property name="name">
! <cstring>dvdDevice</cstring>
</property>
<property name="sizePolicy">
***************
*** 1028,1032 ****
<widget class="QPushButton">
<property name="name">
! <cstring>b_browseDVD_2</cstring>
</property>
<property name="text">
--- 1005,1009 ----
<widget class="QPushButton">
<property name="name">
! <cstring>b_browseDVD</cstring>
</property>
<property name="text">
***************
*** 1044,1051 ****
<widget class="QLabel" row="8" column="0">
<property name="name">
! <cstring>textLabel1_5_2_2</cstring>
</property>
<property name="text">
! <string><b>Devices::</b></string>
</property>
</widget>
--- 1021,1028 ----
<widget class="QLabel" row="8" column="0">
<property name="name">
! <cstring>l_devices</cstring>
</property>
<property name="text">
! <string><b>Devices:</b></string>
</property>
</widget>
***************
*** 1096,1100 ****
<widget class="QLabel" row="0" column="0">
<property name="name">
! <cstring>textLabel1_3_2_2</cstring>
</property>
<property name="sizePolicy">
--- 1073,1077 ----
<widget class="QLabel" row="0" column="0">
<property name="name">
! <cstring>l_encodersettings</cstring>
</property>
<property name="sizePolicy">
***************
*** 1286,1290 ****
<widget class="QLabel" row="1" column="2">
<property name="name">
! <cstring>textLabel1_2_2</cstring>
</property>
<property name="text">
--- 1263,1267 ----
<widget class="QLabel" row="1" column="2">
<property name="name">
! <cstring>l_videocodec</cstring>
</property>
<property name="text">
***************
*** 1337,1352 ****
</image>
<image name="image2">
- <data format="XPM.GZ" length="1341">789c55d3db6ee2301006e07b9e22a277d58ac6399168b517b4e91142e9f9b0da0b7be2145a2810022dadf6dd373363a38d8344be99df89e32807fbcee32873f60f5aab4a561370602c4b673f5fcf66dbdf7f7e7db7da2276ea5fe43aa2fda3d5ee38e00ce7ef1acff7eaf3bd58692d62e41ce9d240ea26ab26df9bcc91c2153173d9ecae9af49b94343716c0cb5048cf15e051b740fac2777d5a3f200311b801511806cc27a2ac29910fc8d00bc3d043ba445993ba23c384d947465e24220a0f0d43e62551d6a4706a983033c39cf9c994a10c909b1d01f961289957c8ae1fe55d1f5932bb8239330c995ba69dbb20aabaab9003c384794aefd7efe631cd3d66c682d9e3b71f8731855f0c13e63d32091291d023844809f6be5f4ca5558ef4902a5091a2f0dad07403625e7789cf86a67b87841c24106f9179987b7988bc216a3c908f481de55a47c86b261ec80b6411611f79642899e7961c3e211696534373e5b31d69ee1bb3f098af865141e14343c99cec5820c78605b3d3d9930acc902ad71dae162f301e4f5e5fdfdea63053ef73aafe9f84855cd2dd652359aa55459f4d5d5d6f3e3eb75fd33a594aaeca1e8c0f0febe4f4084a95daec314cd69fdbcdc7d7099432b5d953c0ab9e9d9f5c40aafa363b18d835a4a9ecdbeca29c956596a5e9f0b2af46365b965726dbefcb91cd96195cdfdcdec1fd0b8cd483cd66193cc2d333f47a3092aecda643b815430f4e07f0a00a9f9f580d2fe1ee390861b60057faab8a76472bde1e59ff539176725e2d57bbb1ac8bbcbf735ded86ae8b9df6df9fad7f94a053e7</data>
- </image>
- <image name="image3">
<data format="XPM.GZ" length="429">789c6dd0bd0ac23010c0f13d4f71345b91ab915605f1111447411c924b8a0e55d03a88f8ee36b9c48fd64cf7ff7121902287ed66057921aead6e8f0474d017c8edad69eebbfdf22132350555c20c5436121902c1fa7c727eb6dd2cc7e1f824ce32a6e19c2b4ecd49134ee7b354e9aef449555d53155ef93d7268520f4c6ad3b78ea8679e2c9b345f84c1a4d62691c360964c40de6243c6b8150d9dc744d1c2265ffc98c7446f43eb12e19f3fc0ecb9102f1ec65d0e</data>
</image>
! <image name="image4">
! <data format="XPM.GZ" length="2370">789c7d95db72e2381086eff31454fa2eb5f58f6d6c63d7d65ee41c924020cc643233b517b66c4e019270482053fbee2babdb0af6c5d050d4a7fe2575b75af697a3c663afd338fa72b05a27eb896aa871b26c1c659bf97cf7ebdf7f7e1f1cba61a3f8ba4ec33bfcebe010a3866a749f17b981d53ed03eacf7a0bf0f74a7811cf331ca71c143f331fe76cdffb3ca745fe3b31a4f6bf3e39affaac61f057b9ffaa170e444c67f5eb01b59fd758d7b5546afb6deb2603f69aa666cd8c41b247ee42766fe692dde84ebd18a5ba9e1736637724d3c98304771c4fe0d731aa69959afcffbd9f876865dbbfe8f2ad3a4c69b9a3eaaadd735f17b8e2f7c52e34bce4f33c79b9bf8c2321f7a63b6eb1d179c28bbdf6bc169e6abc0341c3d49fe8ecb7ad4eae1307bbec7f353a94f20f551b57a65c21933bd30dbf3be2938f66d3e17261edfc677c7dc749aae61737e59100621c7db11bde44f5be172fd67cecffad7c2a5ffb664c9d7dc0f15d87ab60c678e127e2c380f3d87f3a799e453d677245ce6f36e99f77bade52ffde728d97f58ad37cd8595ec47d5fa93b26cfa9de43cbc8819a1b0e2fad192b9e94b3dfb96591f0847c22eb32e30ebbf0bfbc20fcc81c3fd83ae701c98fb868e70267c2df7cd6d350d1f0b0772ff4e6af7f1433813be2d39e2f96de92f57f8d2f623f3b6d68f37d57ec4aee4d8377ccf1cbbc2727e711c2b53bf9570c68c8b9213a327e9f7c465c6957020fc6299e7bf09e7c29e3c5fbc94f5cff679c33cad3e7f20f7354d8417ccca538161e91f150acf2cb3fe1b739667fcbe58949c87c6df64cec39cfdb9bc3fbc21fbbf0a87fc3e812f9c080faaef9bfefacff6a90121410a854cff14720c31622b35186382299e30c31c0b3ce305af5862f5a9c11a1bbce11d5becb46df181639ce014677b9a735ce0528f5fa1ad7dd7b8c12d3ae8e20e3dabe9ebb95ddc63a0f7e96acd577cc303bee3113ff053348ef6b8faf7a4551e9af0f59a0142b41021660d8188124a49518601e578a0a1b6118d694253d13ce99199b6392db46280ada1193def695ee8558f2cd1d48abe8e7b402b33b2a68dd5bcd1bb1e4975c4ae99bfc24eef34a32ded6c3c1f746c7cefb207db984ee894ce24af119dd345c55f282eb5e28adaa546abaee9866ef5ea6c1dea1ac59dada1393bea511f91cea4b05da9a86ab4ea1e314d0bd3ff67d49673ffefef83ff01a8991892</data>
</image>
</images>
<connections>
<connection>
! <sender>buttonOk</sender>
<signal>clicked()</signal>
<receiver>SettingsDialogue</receiver>
--- 1314,1326 ----
</image>
<image name="image2">
<data format="XPM.GZ" length="429">789c6dd0bd0ac23010c0f13d4f71345b91ab915605f1111447411c924b8a0e55d03a88f8ee36b9c48fd64cf7ff7121902287ed66057921aead6e8f0474d017c8edad69eebbfdf22132350555c20c5436121902c1fa7c727eb6dd2cc7e1f824ce32a6e19c2b4ecd49134ee7b354e9aef449555d53155ef93d7268520f4c6ad3b78ea8679e2c9b345f84c1a4d62691c360964c40de6243c6b8150d9dc744d1c2265ffc98c7446f43eb12e19f3fc0ecb9102f1ec65d0e</data>
</image>
! <image name="image3">
! <data format="XPM.GZ" length="1901">789c7dd4c96edb301006e0bb9fc2086f4131d16e09450fd99766b1b327450f122579cfeac4498abe7b879c5f8c9d434d1bc627fe1c5223c36babedebee517b75adf53ccb6743ddd683fca9bd5abe4ca7efbf7efff8d35af19336bf53af1dac7c6badf4666ddd3ebebfab0ca8cb509e7d19aba1b19f36a65de3c0cd5305a75e6a7d621cf96efec63a77be17873acc6cfd81711c7811f61b5be76ca9f72a8ed228b7f313e32c72f9be71aedd7947c645e47c07a39eaae1e6bc3be2d00b7d3b4fd6a5cb6b1879356deccbfd48fd32d2b16d26c5c63a76e7bfb62e3d0dbf1897711227923f36ae92c00be4bca5719db87ec19dac535877ac6b371fc14d3f2a6739af829bfbbd8535ce9f887d0f9ec3a92ff914d6723eea898308f69dedf3240f4ee12b58a3bfb9388cc4b4e72cf94b38854fc5fc00257f0447f0a138f6d0ff6d388bedef85b6e012de1077fc4e683d8363f417fd72fd7e864b78b3712aebd7c5dc2ef13b1cc3b9b3ac2fe00cd670093f35ce22eb7d71e6c38f709669db4fd4cb4a31bd35ce251f88731ffe806378ea2ceb1fe00a3e13174121f9099cc07de7d27a00e7f058ac031d5b8fe0041e3a4bfea7b8ac4af93fca1a5789f5b9b84a2a990fc57550cbfc019cd4b5f5059cc3355c8b7bb3ff8fc50c29caa920cd9f824aaabe66a8e6eb7d1ad0904634a6094de98eeebf64faf4408f9c7be251d03399aa2ff4fa99a139bdd13b5fffa0759edbe0fd36698bb66987765d668fd76ed33eef38e6ef0d3aa09f744847744c27d445a6c733a7fc1970ea8ccee9826b5ed2155dd38dcbcc39754b1ef914702ae41a731e11c50b7512bed2e19152c609738f461d459f19c52fbe92f32e219f6d9d6a55d82b7a2153aa8ad7797ce253bbdef420e2ef7a61af5dd5b77395ec8111ab01759b0c571aaad1d2bc498c4de233635313355535c69dd4a0eef2335543eec60d9f400612cb193e577779e099fefddefa072075baaf</data>
</image>
</images>
<connections>
<connection>
! <sender>b_Cancel</sender>
<signal>clicked()</signal>
<receiver>SettingsDialogue</receiver>
***************
*** 1362,1367 ****
<tabstops>
<tabstop>listBox</tabstop>
! <tabstop>buttonOk</tabstop>
! <tabstop>buttonHelp</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
--- 1336,1341 ----
<tabstops>
<tabstop>listBox</tabstop>
! <tabstop>b_Cancel</tabstop>
! <tabstop>b_Help</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
|
