[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/stable/extragear/multimedia/k3b
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2007-11-06 12:10:29
Message-ID: 1194351029.915045.2261.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 733470 by trueg:

Reset the ignore device properly.

BUG: 151924


 M  +4 -0      ChangeLog  
 M  +1 -1      libk3b/core/k3bcore.h  
 M  +2 -1      src/k3bmediaselectioncombobox.cpp  
 M  +4 -2      src/misc/k3bcdcopydialog.cpp  
 M  +1 -1      src/misc/k3bcdcopydialog.h  
 M  +1 -1      src/misc/k3bdvdcopydialog.cpp  


--- branches/stable/extragear/multimedia/k3b/ChangeLog #733469:733470
@@ -1,3 +1,7 @@
+1.0.5
+=====
+ * Fix CD Copy device selection (Bug 151924)
+
 1.0.4
 =====
  * Never use growisofs parameter -dvd-compat with DVD-RW media in restricted \
                overwrite mode
--- branches/stable/extragear/multimedia/k3b/libk3b/core/k3bcore.h #733469:733470
@@ -23,7 +23,7 @@
 #include "k3b_export.h"
 
 
-#define LIBK3B_VERSION "1.0.4svn"
+#define LIBK3B_VERSION "1.0.5svn"
 
 #define k3bcore K3bCore::k3bCore()
 
--- branches/stable/extragear/multimedia/k3b/src/k3bmediaselectioncombobox.cpp \
#733469:733470 @@ -283,8 +283,9 @@
 
       K3bMedium medium = k3bappcore->mediaCache()->medium( *it );
 
-      if( showMedium( medium ) )
+      if( showMedium( medium ) ) {
           addMedium( *it );
+      }
   }
 
   //
--- branches/stable/extragear/multimedia/k3b/src/misc/k3bcdcopydialog.cpp \
#733469:733470 @@ -365,7 +365,7 @@
 }
 
 
-void K3bCdCopyDialog::slotToggleAll()
+void K3bCdCopyDialog::toggleAll()
 {
   updateOverrideDevice();
 
@@ -447,10 +447,12 @@
         m_writerSelectionWidget->setOverrideDevice( 0 );
         m_writerSelectionWidget->setIgnoreDevice( \
m_comboSourceDevice->selectedDevice() );  }
-    else
+    else {
+        m_writerSelectionWidget->setIgnoreDevice( 0 );
         m_writerSelectionWidget->setOverrideDevice( \
                m_comboSourceDevice->selectedDevice(),
                                                     i18n("Use the same device for \
                burning"),
                                                     i18n("<qt>Use the same device \
for burning <i>(Or insert another medium)</i>") ); +    }
 }
 
 
--- branches/stable/extragear/multimedia/k3b/src/misc/k3bcdcopydialog.h \
#733469:733470 @@ -56,12 +56,12 @@
  private slots:
   void slotStartClicked();
 
-  void slotToggleAll();
   void slotSourceMediumChanged( K3bDevice::Device* );
   void updateOverrideDevice();
 
  protected:
   void init();
+  void toggleAll();
 
  private:
   void loadUserDefaults( KConfigBase* );
--- branches/stable/extragear/multimedia/k3b/src/misc/k3bdvdcopydialog.cpp \
#733469:733470 @@ -432,10 +432,10 @@
         m_writerSelectionWidget->setIgnoreDevice( \
m_comboSourceDevice->selectedDevice() );  }
     else {
+        m_writerSelectionWidget->setIgnoreDevice( 0 );
         m_writerSelectionWidget->setOverrideDevice( \
                m_comboSourceDevice->selectedDevice(),
                                                     i18n("Use the same device for \
                burning"),
                                                     i18n("<qt>Use the same device \
                for burning <i>(Or insert another medium)</i>") );
-        m_writerSelectionWidget->setIgnoreDevice( 0 );
     }
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]