dvd wizard: small ui improvements, warn on file overwrite

svn path=/branches/KDE4/; revision=2995

diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp
index 9b9e9193207f94a133f334a20785a4c249a9b3e4..91f840a0017f6370acb9c53431e1421bd8f7c726 100644 (file)
--- a/src/dvdwizard.cpp
+++ b/src/dvdwizard.cpp
@@ -81,8 +81,21 @@ void DvdWizard::slotPageChanged(int page) {
     } else if (page == 2) {
         m_pageMenu->buttonsInfo();
     } else if (page == 3) {
-        KIO::NetAccess::del(KUrl(m_iso.tmp_folder->url().path() + "/DVD"), this);
-        QTimer::singleShot(300, this, SLOT(generateDvd()));
+        // clear job icons
+        for (int i = 0; i < m_status.job_progress->count(); i++)
+            m_status.job_progress->item(i)->setIcon(KIcon());
+        QString warnMessage;
+        if (KIO::NetAccess::exists(KUrl(m_iso.tmp_folder->url().path() + "/DVD"), KIO::NetAccess::SourceSide, this))
+            warnMessage.append(i18n("Folder %1 already exists. Overwrite ?<br />", m_iso.tmp_folder->url().path() + "/DVD"));
+        if (KIO::NetAccess::exists(KUrl(m_iso.iso_image->url().path()), KIO::NetAccess::SourceSide, this))
+            warnMessage.append(i18n("Image file %1 already exists. Overwrite ?", m_iso.iso_image->url().path()));
+
+        if (!warnMessage.isEmpty() && KMessageBox::questionYesNo(this, warnMessage) == KMessageBox::No) {
+            back();
+        } else {
+            KIO::NetAccess::del(KUrl(m_iso.tmp_folder->url().path() + "/DVD"), this);
+            QTimer::singleShot(300, this, SLOT(generateDvd()));
+        }
     }
 }
 
@@ -401,8 +414,8 @@ void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status) {
 void DvdWizard::slotIsoFinished(int exitCode, QProcess::ExitStatus status) {
     QListWidgetItem *isoitem =  m_status.job_progress->item(4);
     if (status == QProcess::CrashExit) {
-        //m_authorFile.remove();
-        //m_menuFile.remove();
+        m_authorFile.remove();
+        m_menuFile.remove();
         KIO::NetAccess::del(KUrl(m_iso.tmp_folder->url().path() + "/DVD"), this);
         kDebug() << "Iso process crashed";
         isoitem->setIcon(KIcon("dialog-close"));
@@ -410,8 +423,8 @@ void DvdWizard::slotIsoFinished(int exitCode, QProcess::ExitStatus status) {
     }
     isoitem->setIcon(KIcon("dialog-ok"));
     kDebug() << "ISO IMAGE " << m_iso.iso_image->url().path() << " Successfully created";
-    //m_authorFile.remove();
-    //m_menuFile.remove();
+    m_authorFile.remove();
+    m_menuFile.remove();
     KIO::NetAccess::del(KUrl(m_iso.tmp_folder->url().path() + "/DVD"), this);
     KMessageBox::information(this, i18n("DVD iso image %1 successfully created.", m_iso.iso_image->url().path()));
 

diff --git a/src/dvdwizardmenu.cpp b/src/dvdwizardmenu.cpp
index 703597b541d36d3290f38a2c7153881c661b89d6..a010ef79daef7c81bc2e0c99e2254b01a41736cc 100644 (file)
--- a/src/dvdwizardmenu.cpp
+++ b/src/dvdwizardmenu.cpp
@@ -170,7 +170,7 @@ void DvdWizardMenu::buttonChanged() {
             m_view.font_family->blockSignals(true);
             m_view.target_list->blockSignals(true);
             foundButton = true;
-            m_view.button_box->setEnabled(true);
+            m_view.tabWidget->widget(0)->setEnabled(true);
             DvdButton *button = static_cast < DvdButton* >(list.at(i));
             m_view.target_list->setCurrentIndex(button->target());
             m_view.play_text->setText(button->toPlainText());
@@ -184,7 +184,7 @@ void DvdWizardMenu::buttonChanged() {
             break;
         }
     }
-    if (!foundButton) m_view.button_box->setEnabled(false);
+    if (!foundButton) m_view.tabWidget->widget(0)->setEnabled(false);
 }
 
 void DvdWizardMenu::addButton() {

diff --git a/src/widgets/dvdwizardmenu_ui.ui b/src/widgets/dvdwizardmenu_ui.ui
index 210a31c48a98294770674cfb9f61621c7fbe84c3..dd3f3220acdbcff6d0201d05013695b4dfd2c1bc 100644 (file)
--- a/src/widgets/dvdwizardmenu_ui.ui
+++ b/src/widgets/dvdwizardmenu_ui.ui
@@ -5,14 +5,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>421</width>
-    <height>454</height>
+    <width>441</width>
+    <height>451</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_4" >
+  <layout class="QGridLayout" name="gridLayout_5" >
    <item row="0" column="0" >
     <widget class="QCheckBox" name="create_menu" >
      <property name="text" >
@@ -20,104 +20,172 @@
      </property>
     </widget>
    </item>
+   <item row="0" column="1" >
+    <widget class="KComboBox" name="menu_profile" />
+   </item>
    <item row="1" column="0" colspan="2" >
     <widget class="QGroupBox" name="menu_box" >
      <property name="title" >
       <string/>
      </property>
      <layout class="QGridLayout" name="gridLayout_3" >
-      <item row="0" column="0" colspan="2" >
-       <widget class="QLabel" name="label" >
-        <property name="text" >
-         <string>Background</string>
+      <item row="0" column="0" >
+       <widget class="QTabWidget" name="tabWidget" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="KComboBox" name="background_list" >
-        <item>
-         <property name="text" >
-          <string>Color</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>Image</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>Video</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="1" column="2" >
-       <widget class="KColorButton" name="background_color" />
-      </item>
-      <item row="2" column="2" >
-       <widget class="KUrlRequester" name="background_image" />
-      </item>
-      <item row="4" column="0" colspan="3" >
-       <widget class="QGroupBox" name="button_box" >
-        <property name="title" >
-         <string>Button</string>
+        <property name="currentIndex" >
+         <number>0</number>
         </property>
-        <layout class="QGridLayout" name="gridLayout_2" >
-         <item row="0" column="0" >
-          <widget class="QLabel" name="label_3" >
-           <property name="text" >
-            <string>Text</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1" colspan="2" >
-          <widget class="KLineEdit" name="play_text" />
-         </item>
-         <item row="0" column="3" >
-          <widget class="QLabel" name="label_6" >
-           <property name="text" >
-            <string>Target</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="4" >
-          <widget class="KComboBox" name="target_list" >
-           <property name="sizePolicy" >
-            <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0" >
-          <widget class="QLabel" name="label_4" >
-           <property name="text" >
-            <string>Font</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1" >
-          <widget class="KIntSpinBox" name="font_size" >
-           <property name="minimum" >
-            <number>10</number>
-           </property>
-           <property name="maximum" >
-            <number>900</number>
-           </property>
-           <property name="value" >
-            <number>35</number>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="2" colspan="3" >
-          <widget class="QFontComboBox" name="font_family" />
-         </item>
-        </layout>
+        <widget class="QWidget" name="tab" >
+         <attribute name="title" >
+          <string>Button</string>
+         </attribute>
+         <layout class="QGridLayout" name="gridLayout_2" >
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label_3" >
+            <property name="text" >
+             <string>Text</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" colspan="2" >
+           <widget class="KLineEdit" name="play_text" />
+          </item>
+          <item row="0" column="3" >
+           <widget class="QLabel" name="label_6" >
+            <property name="text" >
+             <string>Target</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="4" >
+           <widget class="KComboBox" name="target_list" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="label_4" >
+            <property name="text" >
+             <string>Font</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" >
+           <widget class="KIntSpinBox" name="font_size" >
+            <property name="minimum" >
+             <number>10</number>
+            </property>
+            <property name="maximum" >
+             <number>900</number>
+            </property>
+            <property name="value" >
+             <number>35</number>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2" colspan="3" >
+           <widget class="QFontComboBox" name="font_family" />
+          </item>
+          <item row="2" column="0" colspan="2" >
+           <widget class="QLabel" name="label_5" >
+            <property name="text" >
+             <string>Button colors</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2" colspan="3" >
+           <layout class="QHBoxLayout" name="horizontalLayout" >
+            <item>
+             <widget class="KColorButton" name="text_color" >
+              <property name="text" >
+               <string/>
+              </property>
+              <property name="color" >
+               <color>
+                <red>255</red>
+                <green>255</green>
+                <blue>255</blue>
+               </color>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="KColorButton" name="selected_color" >
+              <property name="color" >
+               <color>
+                <red>170</red>
+                <green>170</green>
+                <blue>255</blue>
+               </color>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="KColorButton" name="highlighted_color" >
+              <property name="color" >
+               <color>
+                <red>255</red>
+                <green>85</green>
+                <blue>0</blue>
+               </color>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="tab_2" >
+         <attribute name="title" >
+          <string>Background</string>
+         </attribute>
+         <layout class="QGridLayout" name="gridLayout_4" >
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label" >
+            <property name="text" >
+             <string>Background</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="KComboBox" name="background_list" >
+            <item>
+             <property name="text" >
+              <string>Color</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>Image</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>Video</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="1" column="1" >
+           <widget class="KColorButton" name="background_color" />
+          </item>
+          <item row="2" column="1" >
+           <widget class="KUrlRequester" name="background_image" />
+          </item>
+         </layout>
+        </widget>
        </widget>
       </item>
-      <item row="6" column="0" colspan="3" >
+      <item row="1" column="0" >
        <layout class="QGridLayout" name="gridLayout" >
         <item row="0" column="0" >
          <widget class="QToolButton" name="add_button" >
@@ -153,52 +221,12 @@
          </spacer>
         </item>
         <item rowspan="3" row="0" column="1" >
-         <widget class="QGraphicsView" name="menu_preview" />
-        </item>
-       </layout>
-      </item>
-      <item row="5" column="0" >
-       <widget class="QLabel" name="label_5" >
-        <property name="text" >
-         <string>Button colors</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="2" >
-       <layout class="QHBoxLayout" name="horizontalLayout" >
-        <item>
-         <widget class="KColorButton" name="text_color" >
-          <property name="text" >
-           <string/>
-          </property>
-          <property name="color" >
-           <color>
-            <red>255</red>
-            <green>255</green>
-            <blue>255</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="KColorButton" name="selected_color" >
-          <property name="color" >
-           <color>
-            <red>170</red>
-            <green>170</green>
-            <blue>255</blue>
-           </color>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="KColorButton" name="highlighted_color" >
-          <property name="color" >
-           <color>
-            <red>255</red>
-            <green>85</green>
-            <blue>0</blue>
-           </color>
+         <widget class="QGraphicsView" name="menu_preview" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
           </property>
          </widget>
         </item>
@@ -210,15 +238,11 @@
      <zorder>background_color</zorder>
      <zorder>background_image</zorder>
      <zorder>button_box</zorder>
-     <zorder>scale_image</zorder>
      <zorder>label_5</zorder>
-     <zorder>text_color</zorder>
      <zorder></zorder>
+     <zorder>tabWidget</zorder>
     </widget>
    </item>
-   <item row="0" column="1" >
-    <widget class="KComboBox" name="menu_profile" />
-   </item>
   </layout>
  </widget>
  <customwidgets>

diff --git a/src/widgets/dvdwizardvob_ui.ui b/src/widgets/dvdwizardvob_ui.ui
index 626378d7346f9c3757fc03a23edbf252ca797916..cd94bb6f9049051e8bc64eb52b81cf220f74682f 100644 (file)
--- a/src/widgets/dvdwizardvob_ui.ui
+++ b/src/widgets/dvdwizardvob_ui.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>359</width>
-    <height>177</height>
+    <width>350</width>
+    <height>142</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -21,7 +21,14 @@
     </widget>
    </item>
    <item row="0" column="1" >
-    <widget class="KUrlRequester" name="intro_vob" />
+    <widget class="KUrlRequester" name="intro_vob" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
    </item>
    <item row="1" column="0" colspan="2" >
     <widget class="QGroupBox" name="vob_list" >
@@ -41,6 +48,19 @@
      </layout>
     </widget>
    </item>
+   <item row="2" column="0" colspan="2" >
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>182</width>
+       <height>37</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item row="3" column="0" colspan="2" >
     <widget class="QLabel" name="error_message" >
      <property name="sizePolicy" >
@@ -54,19 +74,6 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" >
-    <spacer name="verticalSpacer" >
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>182</width>
-       <height>37</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>