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

6 files changed, 60 insertions, 3 deletions

diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index 810435a..4e483ed 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -36,11 +36,11 @@
 
 #define DEFAULT_LANG "English (C)"
 
-Config::Config(QWidget *parent) : QDialog(parent)
+Config::Config(QWidget *parent,int index) : QDialog(parent)
 {
     programPath = qApp->applicationDirPath() + "/";
     ui.setupUi(this);
-    ui.tabConfiguration->setCurrentIndex(0);
+    ui.tabConfiguration->setCurrentIndex(index);
     ui.radioManualProxy->setChecked(true);
     QRegExpValidator *proxyValidator = new QRegExpValidator(this);
     QRegExp validate("[0-9]*");
diff --git a/rbutil/rbutilqt/configure.h b/rbutil/rbutilqt/configure.h
index 07c6e19..3679d0c 100644
--- a/rbutil/rbutilqt/configure.h
+++ b/rbutil/rbutilqt/configure.h
@@ -28,7 +28,7 @@ class Config : public QDialog
 {
     Q_OBJECT
     public:
-        Config(QWidget *parent = 0);
+        Config(QWidget *parent = 0,int index=0);
         void setUserSettings(QSettings*);
         void setDevices(QSettings*);
 
diff --git a/rbutil/rbutilqt/installtalkfrm.ui b/rbutil/rbutilqt/installtalkfrm.ui
index d38784c..970bcb2 100644
--- a/rbutil/rbutilqt/installtalkfrm.ui
+++ b/rbutil/rbutilqt/installtalkfrm.ui
@@ -69,6 +69,32 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="0" >
+       <widget class="QPushButton" name="change" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>Change</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
@@ -206,6 +232,20 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>lineTalkFolder</tabstop>
+  <tabstop>buttonBrowse</tabstop>
+  <tabstop>change</tabstop>
+  <tabstop>talkFiles</tabstop>
+  <tabstop>talkFolders</tabstop>
+  <tabstop>OverwriteWav</tabstop>
+  <tabstop>RemoveWav</tabstop>
+  <tabstop>recursive</tabstop>
+  <tabstop>StripExtensions</tabstop>
+  <tabstop>OverwriteTalk</tabstop>
+  <tabstop>buttonOk</tabstop>
+  <tabstop>buttonCancel</tabstop>
+ </tabstops>
  <resources>
   <include location="rbutilqt.qrc" />
  </resources>
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp
index 9b8b5d9..caceb03 100644
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/rbutil/rbutilqt/installtalkwindow.cpp
@@ -21,6 +21,7 @@
 #include "ui_installtalkfrm.h"
 
 #include "browsedirtree.h"
+#include "configure.h"
 
 InstallTalkWindow::InstallTalkWindow(QWidget *parent) : QDialog(parent)
 {
@@ -28,6 +29,7 @@ InstallTalkWindow::InstallTalkWindow(QWidget *parent) : QDialog(parent)
     talkcreator = new TalkFileCreator(this);
 
     connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder()));
+    connect(ui.change,SIGNAL(clicked()),this,SLOT(change()));
 
     ui.OverwriteWav->setChecked(true);
     ui.RemoveWav->setChecked(true);
@@ -61,6 +63,14 @@ void InstallTalkWindow::setTalkFolder(QString folder)
     ui.lineTalkFolder->setText(folder);
 }
 
+void InstallTalkWindow::change()
+{
+    Config *cw = new Config(this,4);
+    cw->setUserSettings(userSettings);
+    cw->setDevices(devices);
+    cw->show();
+    connect(cw, SIGNAL(settingsUpdated()), this, SIGNAL(settingsUpdated()));
+}
 
 void InstallTalkWindow::accept()
 {
diff --git a/rbutil/rbutilqt/installtalkwindow.h b/rbutil/rbutilqt/installtalkwindow.h
index f4fce5f..11c4c6b 100644
--- a/rbutil/rbutilqt/installtalkwindow.h
+++ b/rbutil/rbutilqt/installtalkwindow.h
@@ -36,8 +36,12 @@ class InstallTalkWindow : public QDialog
         void setUserSettings(QSettings*);
         void setDeviceSettings(QSettings*);
 
+    signals:
+        void settingsUpdated(void);
+        
     public slots:
         void accept(void);
+        void change(void);
 
     private slots:
         void browseFolder(void);
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 30f5477..d292c21 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -747,6 +747,8 @@ void RbUtilQt::createTalkFiles(void)
     installWindow->setUserSettings(userSettings);
     installWindow->setDeviceSettings(devices);
     installWindow->show();
+    connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(downloadInfo()));
+    connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(updateSettings()));
 
 }
 
@@ -757,6 +759,7 @@ void RbUtilQt::uninstall(void)
     uninstallWindow->setUserSettings(userSettings);
     uninstallWindow->setDeviceSettings(devices);
     uninstallWindow->show();
+
 }
 
 void RbUtilQt::uninstallBootloader(void)