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

List:       kde-commits
Subject:    kdeextragear-1/k3b/src/vcd
From:       Christian Kvasny <chris () ckvsoft ! at>
Date:       2003-04-21 23:28:36
[Download RAW message or body]

CVS commit by kvasny: 

general options :)


  M +4 -4      k3bvcddoc.cpp   1.36
  M +14 -3     k3bvcdoptions.cpp   1.16
  M +2 -1      k3bvcdoptions.h   1.14
  M +2 -1      k3bvcdtrackdialog.cpp   1.25


--- kdeextragear-1/k3b/src/vcd/k3bvcddoc.cpp  #1.35:1.36
@@ -457,7 +457,7 @@ void K3bVcdDoc::setPbcTracks()
 {
     // reorder pbc tracks
-    /*    if ( !vcdOptions()->PbcEnabled() )
+    if ( !vcdOptions()->PbcEnabled() )
             return;
-    */
+
     if ( m_tracks ) {
         int count = m_tracks->count();

--- kdeextragear-1/k3b/src/vcd/k3bvcdoptions.cpp  #1.15:1.16
@@ -14,4 +14,6 @@
 */
 
+// Kde Includes
+#include <kapplication.h>
 #include <kconfig.h>
 #include <k3bcore.h>
@@ -19,4 +21,5 @@
 #include <kstandarddirs.h>
 
+// Qt Includes
 #include <qstring.h>
 #include <qfile.h>
@@ -28,5 +31,5 @@
 K3bVcdOptions::K3bVcdOptions()
         : m_restriction( 0 ),
-        m_pbcenabled( false ),
+        m_pbcenabled( loadDefaultPBC() ),
         m_volumeID( i18n( "Project name", "VIDEOCD" ) ),
         m_albumID( "" ),
@@ -54,5 +57,7 @@ K3bVcdOptions::K3bVcdOptions()
         m_segmentfolder( true ),
         m_usegaps( false )
-{}
+{
+    setPbcEnabled( loadDefaultPBC() );
+}
 
 bool K3bVcdOptions::checkCdiFiles()
@@ -131,4 +136,10 @@ K3bVcdOptions K3bVcdOptions::load( KConf
 }
 
+bool K3bVcdOptions::loadDefaultPBC()
+{
+    KConfig* c = kapp->config();
+    c->setGroup( "Video project settings" );
+    return c->readBoolEntry("Use Playback Control", false);
+}
 
 K3bVcdOptions K3bVcdOptions::defaults()

--- kdeextragear-1/k3b/src/vcd/k3bvcdoptions.h  #1.13:1.14
@@ -105,4 +105,5 @@ class K3bVcdOptions
 
         // pbc
+        bool loadDefaultPBC();
         bool m_pbcenabled;
 


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