diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2007-12-14 19:49:11 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2007-12-14 19:49:11 +0000 |
commit | f5c695b43fcf4a4f82984878ceab0a23e87bacfc (patch) | |
tree | 0c713c391dd5660c5d4fc984b83aee326232c04c /rbutil/rbutilqt | |
parent | 815504b44919ac73923359e12aa29fb409cefda2 (diff) | |
download | rockbox-f5c695b43fcf4a4f82984878ceab0a23e87bacfc.tar.gz rockbox-f5c695b43fcf4a4f82984878ceab0a23e87bacfc.zip |
rbutil: added a button into talkfile dialog, to directly jump to config of tts and enc.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15926 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/configure.h | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/installtalkfrm.ui | 40 | ||||
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.cpp | 10 | ||||
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.h | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 3 |
6 files changed, 60 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 810435ab68..4e483ed894 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -36,11 +36,11 @@ | |||
36 | 36 | ||
37 | #define DEFAULT_LANG "English (C)" | 37 | #define DEFAULT_LANG "English (C)" |
38 | 38 | ||
39 | Config::Config(QWidget *parent) : QDialog(parent) | 39 | Config::Config(QWidget *parent,int index) : QDialog(parent) |
40 | { | 40 | { |
41 | programPath = qApp->applicationDirPath() + "/"; | 41 | programPath = qApp->applicationDirPath() + "/"; |
42 | ui.setupUi(this); | 42 | ui.setupUi(this); |
43 | ui.tabConfiguration->setCurrentIndex(0); | 43 | ui.tabConfiguration->setCurrentIndex(index); |
44 | ui.radioManualProxy->setChecked(true); | 44 | ui.radioManualProxy->setChecked(true); |
45 | QRegExpValidator *proxyValidator = new QRegExpValidator(this); | 45 | QRegExpValidator *proxyValidator = new QRegExpValidator(this); |
46 | QRegExp validate("[0-9]*"); | 46 | QRegExp validate("[0-9]*"); |
diff --git a/rbutil/rbutilqt/configure.h b/rbutil/rbutilqt/configure.h index 07c6e19eb5..3679d0c0f5 100644 --- a/rbutil/rbutilqt/configure.h +++ b/rbutil/rbutilqt/configure.h | |||
@@ -28,7 +28,7 @@ class Config : public QDialog | |||
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | public: | 30 | public: |
31 | Config(QWidget *parent = 0); | 31 | Config(QWidget *parent = 0,int index=0); |
32 | void setUserSettings(QSettings*); | 32 | void setUserSettings(QSettings*); |
33 | void setDevices(QSettings*); | 33 | void setDevices(QSettings*); |
34 | 34 | ||
diff --git a/rbutil/rbutilqt/installtalkfrm.ui b/rbutil/rbutilqt/installtalkfrm.ui index d38784c130..970bcb21b5 100644 --- a/rbutil/rbutilqt/installtalkfrm.ui +++ b/rbutil/rbutilqt/installtalkfrm.ui | |||
@@ -69,6 +69,32 @@ | |||
69 | </property> | 69 | </property> |
70 | </widget> | 70 | </widget> |
71 | </item> | 71 | </item> |
72 | <item row="2" column="0" > | ||
73 | <widget class="QPushButton" name="change" > | ||
74 | <property name="sizePolicy" > | ||
75 | <sizepolicy vsizetype="Minimum" hsizetype="Minimum" > | ||
76 | <horstretch>0</horstretch> | ||
77 | <verstretch>0</verstretch> | ||
78 | </sizepolicy> | ||
79 | </property> | ||
80 | <property name="text" > | ||
81 | <string>Change</string> | ||
82 | </property> | ||
83 | </widget> | ||
84 | </item> | ||
85 | <item row="2" column="1" > | ||
86 | <spacer> | ||
87 | <property name="orientation" > | ||
88 | <enum>Qt::Horizontal</enum> | ||
89 | </property> | ||
90 | <property name="sizeHint" > | ||
91 | <size> | ||
92 | <width>40</width> | ||
93 | <height>20</height> | ||
94 | </size> | ||
95 | </property> | ||
96 | </spacer> | ||
97 | </item> | ||
72 | </layout> | 98 | </layout> |
73 | </widget> | 99 | </widget> |
74 | </item> | 100 | </item> |
@@ -206,6 +232,20 @@ | |||
206 | </item> | 232 | </item> |
207 | </layout> | 233 | </layout> |
208 | </widget> | 234 | </widget> |
235 | <tabstops> | ||
236 | <tabstop>lineTalkFolder</tabstop> | ||
237 | <tabstop>buttonBrowse</tabstop> | ||
238 | <tabstop>change</tabstop> | ||
239 | <tabstop>talkFiles</tabstop> | ||
240 | <tabstop>talkFolders</tabstop> | ||
241 | <tabstop>OverwriteWav</tabstop> | ||
242 | <tabstop>RemoveWav</tabstop> | ||
243 | <tabstop>recursive</tabstop> | ||
244 | <tabstop>StripExtensions</tabstop> | ||
245 | <tabstop>OverwriteTalk</tabstop> | ||
246 | <tabstop>buttonOk</tabstop> | ||
247 | <tabstop>buttonCancel</tabstop> | ||
248 | </tabstops> | ||
209 | <resources> | 249 | <resources> |
210 | <include location="rbutilqt.qrc" /> | 250 | <include location="rbutilqt.qrc" /> |
211 | </resources> | 251 | </resources> |
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index 9b8b5d943a..caceb03176 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp | |||
@@ -21,6 +21,7 @@ | |||
21 | #include "ui_installtalkfrm.h" | 21 | #include "ui_installtalkfrm.h" |
22 | 22 | ||
23 | #include "browsedirtree.h" | 23 | #include "browsedirtree.h" |
24 | #include "configure.h" | ||
24 | 25 | ||
25 | InstallTalkWindow::InstallTalkWindow(QWidget *parent) : QDialog(parent) | 26 | InstallTalkWindow::InstallTalkWindow(QWidget *parent) : QDialog(parent) |
26 | { | 27 | { |
@@ -28,6 +29,7 @@ InstallTalkWindow::InstallTalkWindow(QWidget *parent) : QDialog(parent) | |||
28 | talkcreator = new TalkFileCreator(this); | 29 | talkcreator = new TalkFileCreator(this); |
29 | 30 | ||
30 | connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder())); | 31 | connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder())); |
32 | connect(ui.change,SIGNAL(clicked()),this,SLOT(change())); | ||
31 | 33 | ||
32 | ui.OverwriteWav->setChecked(true); | 34 | ui.OverwriteWav->setChecked(true); |
33 | ui.RemoveWav->setChecked(true); | 35 | ui.RemoveWav->setChecked(true); |
@@ -61,6 +63,14 @@ void InstallTalkWindow::setTalkFolder(QString folder) | |||
61 | ui.lineTalkFolder->setText(folder); | 63 | ui.lineTalkFolder->setText(folder); |
62 | } | 64 | } |
63 | 65 | ||
66 | void InstallTalkWindow::change() | ||
67 | { | ||
68 | Config *cw = new Config(this,4); | ||
69 | cw->setUserSettings(userSettings); | ||
70 | cw->setDevices(devices); | ||
71 | cw->show(); | ||
72 | connect(cw, SIGNAL(settingsUpdated()), this, SIGNAL(settingsUpdated())); | ||
73 | } | ||
64 | 74 | ||
65 | void InstallTalkWindow::accept() | 75 | void InstallTalkWindow::accept() |
66 | { | 76 | { |
diff --git a/rbutil/rbutilqt/installtalkwindow.h b/rbutil/rbutilqt/installtalkwindow.h index f4fce5f61f..11c4c6b6a8 100644 --- a/rbutil/rbutilqt/installtalkwindow.h +++ b/rbutil/rbutilqt/installtalkwindow.h | |||
@@ -36,8 +36,12 @@ class InstallTalkWindow : public QDialog | |||
36 | void setUserSettings(QSettings*); | 36 | void setUserSettings(QSettings*); |
37 | void setDeviceSettings(QSettings*); | 37 | void setDeviceSettings(QSettings*); |
38 | 38 | ||
39 | signals: | ||
40 | void settingsUpdated(void); | ||
41 | |||
39 | public slots: | 42 | public slots: |
40 | void accept(void); | 43 | void accept(void); |
44 | void change(void); | ||
41 | 45 | ||
42 | private slots: | 46 | private slots: |
43 | void browseFolder(void); | 47 | void browseFolder(void); |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 30f5477885..d292c211af 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -747,6 +747,8 @@ void RbUtilQt::createTalkFiles(void) | |||
747 | installWindow->setUserSettings(userSettings); | 747 | installWindow->setUserSettings(userSettings); |
748 | installWindow->setDeviceSettings(devices); | 748 | installWindow->setDeviceSettings(devices); |
749 | installWindow->show(); | 749 | installWindow->show(); |
750 | connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo())); | ||
751 | connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); | ||
750 | 752 | ||
751 | } | 753 | } |
752 | 754 | ||
@@ -757,6 +759,7 @@ void RbUtilQt::uninstall(void) | |||
757 | uninstallWindow->setUserSettings(userSettings); | 759 | uninstallWindow->setUserSettings(userSettings); |
758 | uninstallWindow->setDeviceSettings(devices); | 760 | uninstallWindow->setDeviceSettings(devices); |
759 | uninstallWindow->show(); | 761 | uninstallWindow->show(); |
762 | |||
760 | } | 763 | } |
761 | 764 | ||
762 | void RbUtilQt::uninstallBootloader(void) | 765 | void RbUtilQt::uninstallBootloader(void) |