Advertisement
Guest User

dom

a guest
Feb 4th, 2010
175
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 30.98 KB | None | 0 0
  1. diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp
  2. index ff221db..d5de5ff 100644
  3. --- a/rbutil/rbutilqt/base/systeminfo.cpp
  4. +++ b/rbutil/rbutilqt/base/systeminfo.cpp
  5. @@ -119,7 +119,8 @@ QStringList SystemInfo::platforms(enum SystemInfo::PlatformType type, QString va
  6. {
  7. QString target = systemInfos->value("platforms/"+a.at(i), "null").toString();
  8. // only add target if its not disabled
  9. - if(systemInfos->value(target+"/status").toString() == "disabled")
  10. + if(type != PlatformAllDisabled
  11. + && systemInfos->value(target+"/status").toString() == "disabled")
  12. continue;
  13. // report only base targets when PlatformBase is requested
  14. if(type == PlatformBase && target.contains('.'))
  15. diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h
  16. index 45984d4..bab4815 100644
  17. --- a/rbutil/rbutilqt/base/systeminfo.h
  18. +++ b/rbutil/rbutilqt/base/systeminfo.h
  19. @@ -65,6 +65,7 @@ class SystemInfo : public QObject
  20.  
  21. enum PlatformType {
  22. PlatformAll,
  23. + PlatformAllDisabled,
  24. PlatformBase,
  25. PlatformVariant
  26. };
  27. diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
  28. index dafa999..b6bbec0 100644
  29. --- a/rbutil/rbutilqt/configure.cpp
  30. +++ b/rbutil/rbutilqt/configure.cpp
  31. @@ -99,6 +99,7 @@ Config::Config(QWidget *parent,int index) : QDialog(parent)
  32. connect(ui.comboTts, SIGNAL(currentIndexChanged(int)), this, SLOT(updateTtsState(int)));
  33. connect(ui.treeDevices, SIGNAL(itemSelectionChanged()), this, SLOT(updateEncState()));
  34. connect(ui.testTTS,SIGNAL(clicked()),this,SLOT(testTts()));
  35. + connect(ui.showDisabled, SIGNAL(toggled(bool)), this, SLOT(showDisabled(bool)));
  36. setUserSettings();
  37. setDevices();
  38. }
  39. @@ -282,20 +283,38 @@ void Config::updateCacheInfo(QString path)
  40. }
  41.  
  42.  
  43. +void Config::showDisabled(bool show)
  44. +{
  45. + qDebug() << "[Config] disabled targets shown:" << show;
  46. + if(show)
  47. + QMessageBox::warning(this, tr("Showing disabled targets"),
  48. + tr("You just enabled showing targets that are marked disabled. "
  49. + "Disabled targets are not to be used by end users. Please "
  50. + "use this option only if you know what you are doing."));
  51. + setDevices();
  52. +
  53. +}
  54. +
  55. +
  56. void Config::setDevices()
  57. {
  58.  
  59. // setup devices table
  60. qDebug() << "[Config] setting up devices list";
  61.  
  62. - QStringList platformList = SystemInfo::platforms();
  63. + QStringList platformList;
  64. + if(ui.showDisabled->isChecked())
  65. + platformList = SystemInfo::platforms(SystemInfo::PlatformAllDisabled);
  66. + else
  67. + platformList = SystemInfo::platforms(SystemInfo::PlatformAll);
  68.  
  69. QMap <QString, QString> manuf;
  70. QMap <QString, QString> devcs;
  71. for(int it = 0; it < platformList.size(); it++)
  72. {
  73. QString curname = SystemInfo::name(platformList.at(it)) +
  74. - " (" +ServerInfo::platformValue(platformList.at(it),ServerInfo::CurStatus).toString() + ")";
  75. + " (" +ServerInfo::platformValue(platformList.at(it),
  76. + ServerInfo::CurStatus).toString() + ")";
  77. QString curbrand = SystemInfo::brand(platformList.at(it));
  78. manuf.insertMulti(curbrand, platformList.at(it));
  79. devcs.insert(platformList.at(it), curname);
  80. @@ -341,6 +360,14 @@ void Config::setDevices()
  81. items.append(w2);
  82. }
  83. }
  84. + // remove any old items in list
  85. + QTreeWidgetItem* widgetitem;
  86. + do {
  87. + widgetitem = ui.treeDevices->takeTopLevelItem(0);
  88. + delete widgetitem;
  89. + }
  90. + while(widgetitem);
  91. + // add new items
  92. ui.treeDevices->insertTopLevelItems(0, items);
  93. if(w3 != 0)
  94. ui.treeDevices->setCurrentItem(w3); // hilight old selection
  95. diff --git a/rbutil/rbutilqt/configure.h b/rbutil/rbutilqt/configure.h
  96. index 2ca54af..d265490 100644
  97. --- a/rbutil/rbutilqt/configure.h
  98. +++ b/rbutil/rbutilqt/configure.h
  99. @@ -71,6 +71,7 @@ class Config : public QDialog
  100. void updateTtsState(int);
  101. void updateEncState();
  102. void testTts();
  103. + void showDisabled(bool);
  104. };
  105.  
  106. #endif
  107. diff --git a/rbutil/rbutilqt/configurefrm.ui b/rbutil/rbutilqt/configurefrm.ui
  108. index bfd87cb..cd5fbb1 100644
  109. --- a/rbutil/rbutilqt/configurefrm.ui
  110. +++ b/rbutil/rbutilqt/configurefrm.ui
  111. @@ -1,7 +1,8 @@
  112. -<ui version="4.0" >
  113. +<?xml version="1.0" encoding="UTF-8"?>
  114. +<ui version="4.0">
  115. <class>ConfigForm</class>
  116. - <widget class="QDialog" name="ConfigForm" >
  117. - <property name="geometry" >
  118. + <widget class="QDialog" name="ConfigForm">
  119. + <property name="geometry">
  120. <rect>
  121. <x>0</x>
  122. <y>0</y>
  123. @@ -9,195 +10,215 @@
  124. <height>465</height>
  125. </rect>
  126. </property>
  127. - <property name="windowTitle" >
  128. + <property name="windowTitle">
  129. <string>Configuration</string>
  130. </property>
  131. - <layout class="QGridLayout" >
  132. - <item row="0" column="0" colspan="3" >
  133. - <widget class="QLabel" name="labelTitle" >
  134. - <property name="text" >
  135. + <layout class="QGridLayout">
  136. + <item row="0" column="0" colspan="3">
  137. + <widget class="QLabel" name="labelTitle">
  138. + <property name="text">
  139. <string>Configure Rockbox Utility</string>
  140. </property>
  141. </widget>
  142. </item>
  143. - <item row="1" column="0" colspan="3" >
  144. - <widget class="QTabWidget" name="tabConfiguration" >
  145. - <property name="currentIndex" >
  146. + <item row="1" column="0" colspan="3">
  147. + <widget class="QTabWidget" name="tabConfiguration">
  148. + <property name="currentIndex">
  149. <number>0</number>
  150. </property>
  151. - <widget class="QWidget" name="tabDevice" >
  152. - <attribute name="title" >
  153. - <string>&amp;Device</string>
  154. - </attribute>
  155. - <attribute name="icon" >
  156. - <iconset resource="rbutilqt.qrc" >
  157. + <widget class="QWidget" name="tabDevice">
  158. + <attribute name="icon">
  159. + <iconset resource="rbutilqt.qrc">
  160. <normaloff>:/icons/rbutil.png</normaloff>:/icons/rbutil.png</iconset>
  161. </attribute>
  162. - <layout class="QGridLayout" >
  163. - <item row="0" column="0" >
  164. - <widget class="QLabel" name="labelMountPoint" >
  165. - <property name="text" >
  166. + <attribute name="title">
  167. + <string>&amp;Device</string>
  168. + </attribute>
  169. + <layout class="QGridLayout" name="gridLayout">
  170. + <item row="0" column="0" colspan="2">
  171. + <widget class="QLabel" name="labelMountPoint">
  172. + <property name="text">
  173. <string>Select your device in the &amp;filesystem</string>
  174. </property>
  175. - <property name="buddy" >
  176. + <property name="buddy">
  177. <cstring>mountPoint</cstring>
  178. </property>
  179. </widget>
  180. </item>
  181. - <item row="1" column="0" colspan="2" >
  182. - <layout class="QHBoxLayout" >
  183. + <item row="1" column="0" colspan="3">
  184. + <layout class="QHBoxLayout">
  185. <item>
  186. - <widget class="QLineEdit" name="mountPoint" />
  187. + <widget class="QLineEdit" name="mountPoint"/>
  188. </item>
  189. <item>
  190. - <widget class="QPushButton" name="browseMountPoint" >
  191. - <property name="text" >
  192. + <widget class="QPushButton" name="browseMountPoint">
  193. + <property name="text">
  194. <string>&amp;Browse</string>
  195. </property>
  196. - <property name="icon" >
  197. - <iconset resource="rbutilqt.qrc" >
  198. + <property name="icon">
  199. + <iconset resource="rbutilqt.qrc">
  200. <normaloff>:/icons/system-search.png</normaloff>:/icons/system-search.png</iconset>
  201. </property>
  202. - <property name="autoDefault" >
  203. + <property name="autoDefault">
  204. <bool>false</bool>
  205. </property>
  206. </widget>
  207. </item>
  208. </layout>
  209. </item>
  210. - <item row="2" column="0" >
  211. - <widget class="QLabel" name="labelPlayer" >
  212. - <property name="text" >
  213. + <item row="2" column="0">
  214. + <widget class="QLabel" name="labelPlayer">
  215. + <property name="text">
  216. <string>&amp;Select your audio player</string>
  217. </property>
  218. - <property name="buddy" >
  219. + <property name="buddy">
  220. <cstring>treeDevices</cstring>
  221. </property>
  222. </widget>
  223. </item>
  224. - <item row="3" column="0" colspan="2" >
  225. - <widget class="QTreeWidget" name="treeDevices" >
  226. + <item row="2" column="1">
  227. + <spacer name="horizontalSpacer">
  228. + <property name="orientation">
  229. + <enum>Qt::Horizontal</enum>
  230. + </property>
  231. + <property name="sizeHint" stdset="0">
  232. + <size>
  233. + <width>118</width>
  234. + <height>20</height>
  235. + </size>
  236. + </property>
  237. + </spacer>
  238. + </item>
  239. + <item row="2" column="2">
  240. + <widget class="QCheckBox" name="showDisabled">
  241. + <property name="text">
  242. + <string>Show disabled targets</string>
  243. + </property>
  244. + </widget>
  245. + </item>
  246. + <item row="3" column="0" colspan="3">
  247. + <widget class="QTreeWidget" name="treeDevices">
  248. <column>
  249. - <property name="text" >
  250. + <property name="text">
  251. <string>1</string>
  252. </property>
  253. </column>
  254. </widget>
  255. </item>
  256. - <item row="4" column="0" colspan="2" >
  257. - <widget class="QPushButton" name="buttonAutodetect" >
  258. - <property name="text" >
  259. + <item row="4" column="0">
  260. + <widget class="QPushButton" name="buttonAutodetect">
  261. + <property name="text">
  262. <string>&amp;Autodetect</string>
  263. </property>
  264. - <property name="icon" >
  265. - <iconset resource="rbutilqt.qrc" >
  266. + <property name="icon">
  267. + <iconset resource="rbutilqt.qrc">
  268. <normaloff>:/icons/edit-find.png</normaloff>:/icons/edit-find.png</iconset>
  269. </property>
  270. - <property name="default" >
  271. + <property name="default">
  272. <bool>true</bool>
  273. </property>
  274. - <property name="flat" >
  275. + <property name="flat">
  276. <bool>false</bool>
  277. </property>
  278. </widget>
  279. </item>
  280. </layout>
  281. </widget>
  282. - <widget class="QWidget" name="tabProxy" >
  283. - <attribute name="title" >
  284. - <string>&amp;Proxy</string>
  285. - </attribute>
  286. - <attribute name="icon" >
  287. - <iconset resource="rbutilqt.qrc" >
  288. + <widget class="QWidget" name="tabProxy">
  289. + <attribute name="icon">
  290. + <iconset resource="rbutilqt.qrc">
  291. <normaloff>:/icons/network-idle.png</normaloff>:/icons/network-idle.png</iconset>
  292. </attribute>
  293. - <layout class="QGridLayout" >
  294. - <item row="0" column="0" >
  295. - <widget class="QRadioButton" name="radioNoProxy" >
  296. - <property name="text" >
  297. + <attribute name="title">
  298. + <string>&amp;Proxy</string>
  299. + </attribute>
  300. + <layout class="QGridLayout">
  301. + <item row="0" column="0">
  302. + <widget class="QRadioButton" name="radioNoProxy">
  303. + <property name="text">
  304. <string>&amp;No Proxy</string>
  305. </property>
  306. - <property name="checked" >
  307. + <property name="checked">
  308. <bool>true</bool>
  309. </property>
  310. </widget>
  311. </item>
  312. - <item row="1" column="0" >
  313. - <widget class="QRadioButton" name="radioSystemProxy" >
  314. - <property name="text" >
  315. + <item row="1" column="0">
  316. + <widget class="QRadioButton" name="radioSystemProxy">
  317. + <property name="text">
  318. <string>Use S&amp;ystem values</string>
  319. </property>
  320. </widget>
  321. </item>
  322. - <item row="2" column="0" >
  323. - <widget class="QRadioButton" name="radioManualProxy" >
  324. - <property name="text" >
  325. + <item row="2" column="0">
  326. + <widget class="QRadioButton" name="radioManualProxy">
  327. + <property name="text">
  328. <string>&amp;Manual Proxy settings</string>
  329. </property>
  330. </widget>
  331. </item>
  332. - <item row="3" column="0" >
  333. - <widget class="QGroupBox" name="groupBox" >
  334. - <property name="title" >
  335. + <item row="3" column="0">
  336. + <widget class="QGroupBox" name="groupBox">
  337. + <property name="title">
  338. <string>Proxy Values</string>
  339. </property>
  340. - <layout class="QGridLayout" >
  341. - <item row="0" column="0" >
  342. - <widget class="QLabel" name="label" >
  343. - <property name="text" >
  344. + <layout class="QGridLayout">
  345. + <item row="0" column="0">
  346. + <widget class="QLabel" name="label">
  347. + <property name="text">
  348. <string>&amp;Host:</string>
  349. </property>
  350. - <property name="buddy" >
  351. + <property name="buddy">
  352. <cstring>proxyHost</cstring>
  353. </property>
  354. </widget>
  355. </item>
  356. - <item row="0" column="1" >
  357. - <widget class="QLineEdit" name="proxyHost" >
  358. - <property name="frame" >
  359. + <item row="0" column="1">
  360. + <widget class="QLineEdit" name="proxyHost">
  361. + <property name="frame">
  362. <bool>true</bool>
  363. </property>
  364. </widget>
  365. </item>
  366. - <item row="1" column="0" >
  367. - <widget class="QLabel" name="label_2" >
  368. - <property name="text" >
  369. + <item row="1" column="0">
  370. + <widget class="QLabel" name="label_2">
  371. + <property name="text">
  372. <string>&amp;Port:</string>
  373. </property>
  374. - <property name="buddy" >
  375. + <property name="buddy">
  376. <cstring>proxyPort</cstring>
  377. </property>
  378. </widget>
  379. </item>
  380. - <item row="1" column="1" >
  381. - <widget class="QLineEdit" name="proxyPort" />
  382. + <item row="1" column="1">
  383. + <widget class="QLineEdit" name="proxyPort"/>
  384. </item>
  385. - <item row="2" column="1" >
  386. - <widget class="QLineEdit" name="proxyUser" />
  387. + <item row="2" column="1">
  388. + <widget class="QLineEdit" name="proxyUser"/>
  389. </item>
  390. - <item row="3" column="1" >
  391. - <widget class="QLineEdit" name="proxyPass" >
  392. - <property name="echoMode" >
  393. + <item row="3" column="1">
  394. + <widget class="QLineEdit" name="proxyPass">
  395. + <property name="echoMode">
  396. <enum>QLineEdit::Password</enum>
  397. </property>
  398. </widget>
  399. </item>
  400. - <item row="2" column="0" >
  401. - <widget class="QLabel" name="label_3" >
  402. - <property name="text" >
  403. + <item row="2" column="0">
  404. + <widget class="QLabel" name="label_3">
  405. + <property name="text">
  406. <string>&amp;Username</string>
  407. </property>
  408. - <property name="buddy" >
  409. + <property name="buddy">
  410. <cstring>proxyUser</cstring>
  411. </property>
  412. </widget>
  413. </item>
  414. - <item row="3" column="0" >
  415. - <widget class="QLabel" name="label_4" >
  416. - <property name="text" >
  417. + <item row="3" column="0">
  418. + <widget class="QLabel" name="label_4">
  419. + <property name="text">
  420. <string>Pass&amp;word</string>
  421. </property>
  422. - <property name="buddy" >
  423. + <property name="buddy">
  424. <cstring>proxyPass</cstring>
  425. </property>
  426. </widget>
  427. @@ -205,12 +226,12 @@
  428. </layout>
  429. </widget>
  430. </item>
  431. - <item row="4" column="0" >
  432. + <item row="4" column="0">
  433. <spacer>
  434. - <property name="orientation" >
  435. + <property name="orientation">
  436. <enum>Qt::Vertical</enum>
  437. </property>
  438. - <property name="sizeHint" stdset="0" >
  439. + <property name="sizeHint" stdset="0">
  440. <size>
  441. <width>20</width>
  442. <height>40</height>
  443. @@ -220,108 +241,108 @@
  444. </item>
  445. </layout>
  446. </widget>
  447. - <widget class="QWidget" name="tabLanguage" >
  448. - <attribute name="title" >
  449. - <string>&amp;Language</string>
  450. - </attribute>
  451. - <attribute name="icon" >
  452. - <iconset resource="rbutilqt.qrc" >
  453. + <widget class="QWidget" name="tabLanguage">
  454. + <attribute name="icon">
  455. + <iconset resource="rbutilqt.qrc">
  456. <normaloff>:/icons/preferences-desktop-locale.png</normaloff>:/icons/preferences-desktop-locale.png</iconset>
  457. </attribute>
  458. - <layout class="QGridLayout" >
  459. - <item row="0" column="0" >
  460. - <widget class="QListWidget" name="listLanguages" />
  461. + <attribute name="title">
  462. + <string>&amp;Language</string>
  463. + </attribute>
  464. + <layout class="QGridLayout">
  465. + <item row="0" column="0">
  466. + <widget class="QListWidget" name="listLanguages"/>
  467. </item>
  468. </layout>
  469. </widget>
  470. - <widget class="QWidget" name="tabCache" >
  471. - <attribute name="title" >
  472. - <string>Cac&amp;he</string>
  473. - </attribute>
  474. - <attribute name="icon" >
  475. - <iconset resource="rbutilqt.qrc" >
  476. + <widget class="QWidget" name="tabCache">
  477. + <attribute name="icon">
  478. + <iconset resource="rbutilqt.qrc">
  479. <normaloff>:/icons/package-x-generic.png</normaloff>:/icons/package-x-generic.png</iconset>
  480. </attribute>
  481. - <attribute name="toolTip" >
  482. + <attribute name="title">
  483. + <string>Cac&amp;he</string>
  484. + </attribute>
  485. + <attribute name="toolTip">
  486. <string>Download cache settings</string>
  487. </attribute>
  488. - <layout class="QGridLayout" >
  489. - <item row="0" column="0" colspan="2" >
  490. - <widget class="QLabel" name="cacheDescription" >
  491. - <property name="text" >
  492. + <layout class="QGridLayout">
  493. + <item row="0" column="0" colspan="2">
  494. + <widget class="QLabel" name="cacheDescription">
  495. + <property name="text">
  496. <string>Rockbox Utility uses a local download cache to save network traffic. You can change the path to the cache and use it as local repository by enabling Offline mode.</string>
  497. </property>
  498. - <property name="wordWrap" >
  499. + <property name="wordWrap">
  500. <bool>true</bool>
  501. </property>
  502. </widget>
  503. </item>
  504. - <item row="1" column="0" >
  505. - <widget class="QLabel" name="cacheSize" >
  506. - <property name="text" >
  507. + <item row="1" column="0">
  508. + <widget class="QLabel" name="cacheSize">
  509. + <property name="text">
  510. <string>Current cache size is %1</string>
  511. </property>
  512. </widget>
  513. </item>
  514. - <item row="2" column="0" colspan="2" >
  515. - <layout class="QHBoxLayout" >
  516. + <item row="2" column="0" colspan="2">
  517. + <layout class="QHBoxLayout">
  518. <item>
  519. - <widget class="QLabel" name="label_5" >
  520. - <property name="text" >
  521. + <widget class="QLabel" name="label_5">
  522. + <property name="text">
  523. <string>P&amp;ath</string>
  524. </property>
  525. - <property name="buddy" >
  526. + <property name="buddy">
  527. <cstring>cachePath</cstring>
  528. </property>
  529. </widget>
  530. </item>
  531. <item>
  532. - <widget class="QLineEdit" name="cachePath" >
  533. - <property name="toolTip" >
  534. + <widget class="QLineEdit" name="cachePath">
  535. + <property name="toolTip">
  536. <string>Entering an invalid folder will reset the path to the systems temporary path.</string>
  537. </property>
  538. </widget>
  539. </item>
  540. <item>
  541. - <widget class="QPushButton" name="buttonCacheBrowse" >
  542. - <property name="text" >
  543. + <widget class="QPushButton" name="buttonCacheBrowse">
  544. + <property name="text">
  545. <string>&amp;Browse</string>
  546. </property>
  547. - <property name="icon" >
  548. - <iconset resource="rbutilqt.qrc" >
  549. + <property name="icon">
  550. + <iconset resource="rbutilqt.qrc">
  551. <normaloff>:/icons/edit-find.png</normaloff>:/icons/edit-find.png</iconset>
  552. </property>
  553. </widget>
  554. </item>
  555. </layout>
  556. </item>
  557. - <item row="3" column="0" colspan="2" >
  558. - <layout class="QVBoxLayout" >
  559. + <item row="3" column="0" colspan="2">
  560. + <layout class="QVBoxLayout">
  561. <item>
  562. - <widget class="QCheckBox" name="cacheDisable" >
  563. - <property name="text" >
  564. + <widget class="QCheckBox" name="cacheDisable">
  565. + <property name="text">
  566. <string>Disable local &amp;download cache</string>
  567. </property>
  568. </widget>
  569. </item>
  570. <item>
  571. - <widget class="QCheckBox" name="cacheOfflineMode" >
  572. - <property name="toolTip" >
  573. + <widget class="QCheckBox" name="cacheOfflineMode">
  574. + <property name="toolTip">
  575. <string>This will try to use all information from the cache, even information about updates. Only use this option if you want to install without network connection. Note: you need to do the same install you want to perform later with network access first to download all required files to the cache.</string>
  576. </property>
  577. - <property name="text" >
  578. + <property name="text">
  579. <string>O&amp;ffline mode</string>
  580. </property>
  581. </widget>
  582. </item>
  583. </layout>
  584. </item>
  585. - <item row="4" column="1" >
  586. + <item row="4" column="1">
  587. <spacer>
  588. - <property name="orientation" >
  589. + <property name="orientation">
  590. <enum>Qt::Vertical</enum>
  591. </property>
  592. - <property name="sizeHint" stdset="0" >
  593. + <property name="sizeHint" stdset="0">
  594. <size>
  595. <width>20</width>
  596. <height>61</height>
  597. @@ -329,12 +350,12 @@
  598. </property>
  599. </spacer>
  600. </item>
  601. - <item row="5" column="0" >
  602. + <item row="5" column="0">
  603. <spacer>
  604. - <property name="orientation" >
  605. + <property name="orientation">
  606. <enum>Qt::Horizontal</enum>
  607. </property>
  608. - <property name="sizeHint" stdset="0" >
  609. + <property name="sizeHint" stdset="0">
  610. <size>
  611. <width>40</width>
  612. <height>20</height>
  613. @@ -342,78 +363,78 @@
  614. </property>
  615. </spacer>
  616. </item>
  617. - <item row="5" column="1" >
  618. - <widget class="QPushButton" name="buttonCacheClear" >
  619. - <property name="text" >
  620. + <item row="5" column="1">
  621. + <widget class="QPushButton" name="buttonCacheClear">
  622. + <property name="text">
  623. <string>Clean cache &amp;now</string>
  624. </property>
  625. - <property name="icon" >
  626. - <iconset resource="rbutilqt.qrc" >
  627. + <property name="icon">
  628. + <iconset resource="rbutilqt.qrc">
  629. <normaloff>:/icons/user-trash-full.png</normaloff>:/icons/user-trash-full.png</iconset>
  630. </property>
  631. </widget>
  632. </item>
  633. </layout>
  634. </widget>
  635. - <widget class="QWidget" name="tabTts" >
  636. - <attribute name="title" >
  637. - <string>&amp;TTS &amp;&amp; Encoder</string>
  638. - </attribute>
  639. - <attribute name="icon" >
  640. - <iconset resource="rbutilqt.qrc" >
  641. + <widget class="QWidget" name="tabTts">
  642. + <attribute name="icon">
  643. + <iconset resource="rbutilqt.qrc">
  644. <normaloff>:/icons/audio-input-microphone.png</normaloff>:/icons/audio-input-microphone.png</iconset>
  645. </attribute>
  646. - <layout class="QVBoxLayout" >
  647. + <attribute name="title">
  648. + <string>&amp;TTS &amp;&amp; Encoder</string>
  649. + </attribute>
  650. + <layout class="QVBoxLayout">
  651. <item>
  652. - <widget class="QGroupBox" name="groupBox_2" >
  653. - <property name="title" >
  654. + <widget class="QGroupBox" name="groupBox_2">
  655. + <property name="title">
  656. <string>TTS Engine</string>
  657. </property>
  658. - <layout class="QGridLayout" >
  659. - <item row="0" column="0" >
  660. - <widget class="QLabel" name="labelTts" >
  661. - <property name="text" >
  662. + <layout class="QGridLayout">
  663. + <item row="0" column="0">
  664. + <widget class="QLabel" name="labelTts">
  665. + <property name="text">
  666. <string>&amp;Select TTS Engine</string>
  667. </property>
  668. - <property name="buddy" >
  669. + <property name="buddy">
  670. <cstring>comboTts</cstring>
  671. </property>
  672. </widget>
  673. </item>
  674. - <item row="0" column="1" colspan="2" >
  675. - <widget class="QComboBox" name="comboTts" />
  676. + <item row="0" column="1" colspan="2">
  677. + <widget class="QComboBox" name="comboTts"/>
  678. </item>
  679. - <item row="1" column="0" >
  680. - <widget class="QLabel" name="labelTtsExecutable" >
  681. - <property name="text" >
  682. + <item row="1" column="0">
  683. + <widget class="QLabel" name="labelTtsExecutable">
  684. + <property name="text">
  685. <string>Configure TTS Engine</string>
  686. </property>
  687. </widget>
  688. </item>
  689. - <item row="1" column="1" >
  690. - <widget class="QLabel" name="configTTSstatus" >
  691. - <property name="text" >
  692. + <item row="1" column="1">
  693. + <widget class="QLabel" name="configTTSstatus">
  694. + <property name="text">
  695. <string>Configuration invalid!</string>
  696. </property>
  697. </widget>
  698. </item>
  699. - <item row="1" column="2" >
  700. - <widget class="QLabel" name="configTTSstatusimg" >
  701. - <property name="text" >
  702. + <item row="1" column="2">
  703. + <widget class="QLabel" name="configTTSstatusimg">
  704. + <property name="text">
  705. <string/>
  706. </property>
  707. - <property name="pixmap" >
  708. - <pixmap resource="rbutilqt.qrc" >:/icons/dialog-error.png</pixmap>
  709. + <property name="pixmap">
  710. + <pixmap resource="rbutilqt.qrc">:/icons/dialog-error.png</pixmap>
  711. </property>
  712. </widget>
  713. </item>
  714. - <item row="1" column="3" >
  715. - <widget class="QPushButton" name="configTts" >
  716. - <property name="text" >
  717. + <item row="1" column="3">
  718. + <widget class="QPushButton" name="configTts">
  719. + <property name="text">
  720. <string>Configure &amp;TTS</string>
  721. </property>
  722. - <property name="icon" >
  723. - <iconset resource="rbutilqt.qrc" >
  724. + <property name="icon">
  725. + <iconset resource="rbutilqt.qrc">
  726. <normaloff>:/icons/edit-find.png</normaloff>:/icons/edit-find.png</iconset>
  727. </property>
  728. </widget>
  729. @@ -429,42 +450,42 @@
  730. </widget>
  731. </item>
  732. <item>
  733. - <widget class="QGroupBox" name="groupBox_3" >
  734. - <property name="title" >
  735. + <widget class="QGroupBox" name="groupBox_3">
  736. + <property name="title">
  737. <string>Encoder Engine</string>
  738. </property>
  739. - <layout class="QGridLayout" >
  740. - <item row="0" column="1" >
  741. - <widget class="QLabel" name="configEncstatus" >
  742. - <property name="text" >
  743. + <layout class="QGridLayout">
  744. + <item row="0" column="1">
  745. + <widget class="QLabel" name="configEncstatus">
  746. + <property name="text">
  747. <string>Configuration invalid!</string>
  748. </property>
  749. </widget>
  750. </item>
  751. - <item row="0" column="2" >
  752. - <widget class="QLabel" name="configEncstatusimg" >
  753. - <property name="text" >
  754. + <item row="0" column="2">
  755. + <widget class="QLabel" name="configEncstatusimg">
  756. + <property name="text">
  757. <string/>
  758. </property>
  759. - <property name="pixmap" >
  760. - <pixmap resource="rbutilqt.qrc" >:/icons/dialog-error.png</pixmap>
  761. + <property name="pixmap">
  762. + <pixmap resource="rbutilqt.qrc">:/icons/dialog-error.png</pixmap>
  763. </property>
  764. </widget>
  765. </item>
  766. - <item row="0" column="3" >
  767. - <widget class="QPushButton" name="configEncoder" >
  768. - <property name="text" >
  769. + <item row="0" column="3">
  770. + <widget class="QPushButton" name="configEncoder">
  771. + <property name="text">
  772. <string>Configure &amp;Enc</string>
  773. </property>
  774. - <property name="icon" >
  775. - <iconset resource="rbutilqt.qrc" >
  776. + <property name="icon">
  777. + <iconset resource="rbutilqt.qrc">
  778. <normaloff>:/icons/edit-find.png</normaloff>:/icons/edit-find.png</iconset>
  779. </property>
  780. </widget>
  781. </item>
  782. - <item row="0" column="0" >
  783. - <widget class="QLabel" name="encoderName" >
  784. - <property name="text" >
  785. + <item row="0" column="0">
  786. + <widget class="QLabel" name="encoderName">
  787. + <property name="text">
  788. <string>encoder name</string>
  789. </property>
  790. </widget>
  791. @@ -474,10 +495,10 @@
  792. </item>
  793. <item>
  794. <spacer>
  795. - <property name="orientation" >
  796. + <property name="orientation">
  797. <enum>Qt::Vertical</enum>
  798. </property>
  799. - <property name="sizeHint" stdset="0" >
  800. + <property name="sizeHint" stdset="0">
  801. <size>
  802. <width>458</width>
  803. <height>131</height>
  804. @@ -489,12 +510,12 @@
  805. </widget>
  806. </widget>
  807. </item>
  808. - <item row="2" column="0" >
  809. + <item row="2" column="0">
  810. <spacer>
  811. - <property name="orientation" >
  812. + <property name="orientation">
  813. <enum>Qt::Horizontal</enum>
  814. </property>
  815. - <property name="sizeHint" stdset="0" >
  816. + <property name="sizeHint" stdset="0">
  817. <size>
  818. <width>40</width>
  819. <height>20</height>
  820. @@ -502,24 +523,24 @@
  821. </property>
  822. </spacer>
  823. </item>
  824. - <item row="2" column="1" >
  825. - <widget class="QPushButton" name="buttonOk" >
  826. - <property name="text" >
  827. + <item row="2" column="1">
  828. + <widget class="QPushButton" name="buttonOk">
  829. + <property name="text">
  830. <string>&amp;Ok</string>
  831. </property>
  832. - <property name="icon" >
  833. - <iconset resource="rbutilqt.qrc" >
  834. + <property name="icon">
  835. + <iconset resource="rbutilqt.qrc">
  836. <normaloff>:/icons/go-next.png</normaloff>:/icons/go-next.png</iconset>
  837. </property>
  838. </widget>
  839. </item>
  840. - <item row="2" column="2" >
  841. - <widget class="QPushButton" name="buttonCancel" >
  842. - <property name="text" >
  843. + <item row="2" column="2">
  844. + <widget class="QPushButton" name="buttonCancel">
  845. + <property name="text">
  846. <string>&amp;Cancel</string>
  847. </property>
  848. - <property name="icon" >
  849. - <iconset resource="rbutilqt.qrc" >
  850. + <property name="icon">
  851. + <iconset resource="rbutilqt.qrc">
  852. <normaloff>:/icons/process-stop.png</normaloff>:/icons/process-stop.png</iconset>
  853. </property>
  854. </widget>
  855. @@ -527,7 +548,7 @@
  856. </layout>
  857. </widget>
  858. <resources>
  859. - <include location="rbutilqt.qrc" />
  860. + <include location="rbutilqt.qrc"/>
  861. </resources>
  862. <connections/>
  863. </ui>
  864.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement