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

List:       kde-commits
Subject:    branches/KDE/3.4/kdemultimedia/juk
From:       Michael Pyne <michael.pyne () kdemail ! net>
Date:       2005-10-02 4:10:21
Message-ID: 1128226221.298421.11631.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 466262 by mpyne:

Backport bugfixes to KDE 3.4 before the 3.4.3 release.

* Don't call setup() twice.
* Fix tabstops in some dialogs.
* Set a caption for the Example Tags Dialog, reusing a translated string.
* Fix a compile warning by using the correct return type for a signal.
* Correctly update the Now Playing bar when you change the tag of the playing file.


 M  +3 -0      exampleoptions.cpp  
 M  +11 -1     exampleoptionsbase.ui  
 M  +1 -1      googlefetcherdialog.h  
 M  +5 -0      nowplaying.cpp  
 M  +6 -1      playermanager.cpp  
 M  +1 -0      playermanager.h  


--- branches/KDE/3.4/kdemultimedia/juk/exampleoptions.cpp #466261:466262
@@ -14,6 +14,8 @@
  ***************************************************************************/
 
 #include <kurlrequester.h>
+#include <klocale.h>
+
 #include <qradiobutton.h>
 #include <qlayout.h>
 
@@ -45,6 +47,7 @@
 ExampleOptionsDialog::ExampleOptionsDialog(QWidget *parent) :
     QDialog(parent, "example options dialog")
 {
+    setCaption(i18n("JuK"));
     QVBoxLayout *l = new QVBoxLayout(this);
 
     m_options = new ExampleOptions(this);
--- branches/KDE/3.4/kdemultimedia/juk/exampleoptionsbase.ui #466261:466262
@@ -9,7 +9,7 @@
             <x>0</x>
             <y>0</y>
             <width>308</width>
-            <height>330</height>
+            <height>334</height>
         </rect>
     </property>
     <property name="caption">
@@ -257,6 +257,16 @@
         <slot>exampleDataChanged()</slot>
     </connection>
 </connections>
+<tabstops>
+    <tabstop>m_exampleFile</tabstop>
+    <tabstop>m_manualTagsButton</tabstop>
+    <tabstop>m_exampleTitle</tabstop>
+    <tabstop>m_exampleArtist</tabstop>
+    <tabstop>m_exampleAlbum</tabstop>
+    <tabstop>m_exampleGenre</tabstop>
+    <tabstop>m_exampleTrack</tabstop>
+    <tabstop>m_exampleYear</tabstop>
+</tabstops>
 <signals>
     <signal>dataChanged()</signal>
     <signal>fileChanged()</signal>
--- branches/KDE/3.4/kdemultimedia/juk/googlefetcherdialog.h #466261:466262
@@ -47,7 +47,7 @@
     void refreshScreen(GoogleImageList &list);
 
 signals:
-    int sizeChanged(GoogleFetcher::ImageSize);
+    void sizeChanged(GoogleFetcher::ImageSize);
 
 protected slots:
     void slotOk();
--- branches/KDE/3.4/kdemultimedia/juk/nowplaying.cpp #466261:466262
@@ -51,6 +51,11 @@
     m_observer(this, collection),
     m_collection(collection)
 {
+    // m_observer is set to watch the PlaylistCollection, also watch for
+    // changes that come from CollectionList.
+
+    CollectionList::instance()->addObserver(&m_observer);
+
     layout()->setMargin(5);
     layout()->setSpacing(3);
     setFixedHeight(imageSize + 2 + layout()->margin() * 2);
--- branches/KDE/3.4/kdemultimedia/juk/playermanager.cpp #466261:466262
@@ -89,7 +89,8 @@
     m_player(0),
     m_timer(0),
     m_noSeek(false),
-    m_muted(false)
+    m_muted(false),
+    m_setup(false)
 {
 // This class is the first thing constructed during program startup, and
 // therefore has no access to the widgets needed by the setup() method.
@@ -579,6 +580,10 @@
         return;
     }
 
+    if(m_setup)
+        return;
+    m_setup = true;
+
     // initialize action states
 
     action("pause")->setEnabled(false);
--- branches/KDE/3.4/kdemultimedia/juk/playermanager.h #466261:466262
@@ -106,6 +106,7 @@
     QTimer *m_timer;
     bool m_noSeek;
     bool m_muted;
+    bool m_setup;
 
     static const int m_pollInterval = 800;
 };
[prev in list] [next in list] [prev in thread] [next in thread]