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

List:       kde-commits
Subject:    kdemultimedia/noatun/modules/kjofol-skin
From:       Stefan Gehn <sgehn () gmx ! net>
Date:       2003-07-12 13:49:06
[Download RAW message or body]

CVS commit by metz: 

open Noatun preferences-dialog with kjofol prefs page on prefsbutton. Changed tooltip \
accordingly.


  M +4 -2      kjbutton.cpp   1.18
  M +3 -4      kjloader.cpp   1.81
  M +8 -8      kjloader.h   1.27


--- kdemultimedia/noatun/modules/kjofol-skin/kjbutton.cpp  #1.17:1.18
@@ -11,5 +11,7 @@
 #include "kjbutton.moc"
 #include "kjloader.h"
+#include "kjprefs.h"
 
+#include <noatun/pref.h>
 #include <noatun/player.h>
 #include <noatun/vequalizer.h>
@@ -139,5 +141,5 @@ QString KJButton::tip()
                 str=i18n("Rewind");
         else if (mTitle=="preferencesbutton")
-                str=i18n("Preferences");
+                str=i18n("K-Jöfol Preferences");
         else if (mTitle=="dockmodebutton")
                 str=i18n("Switch to dockmode");
@@ -291,5 +293,5 @@ void KJButton::mouseRelease(const QPoint
                 napp->player()->skipTo(napp->player()->getTime()-10000);
         else if (mTitle=="preferencesbutton")
-                napp->preferences();
+                napp->preferencesBox()->show(static_cast<CModule \
*>(KJWidget::parent()->prefs()));  else if (mTitle=="dockmodebutton")
                 KJWidget::parent()->switchToDockmode();

--- kdemultimedia/noatun/modules/kjofol-skin/kjloader.cpp  #1.80:1.81
@@ -103,5 +103,5 @@ KJLoader *KJLoader::kjofol=0;
 
 
-KJLoader::KJLoader(void)
+KJLoader::KJLoader()
         : QWidget(0,"KJLoader", WType_TopLevel | WStyle_NoBorder | WRepaintNoErase \
                ),
           UserInterface(), moving(false), mClickedIn(0), mText(0), mNumbers(0), \
mVolumeFont(0), mPitchFont(0), splashScreen(0) @@ -746,5 +746,5 @@ void \
KJLoader::readConfig()  }
 
-void KJLoader::showSplash(void)
+void KJLoader::showSplash()
 {
         splashScreen = new QLabel( 0L, "SplashScreen",
@@ -769,5 +769,5 @@ void KJLoader::showSplash(void)
 }
 
-void KJLoader::hideSplash(void)
+void KJLoader::hideSplash()
 {
         splashScreen->hide();

--- kdemultimedia/noatun/modules/kjofol-skin/kjloader.h  #1.26:1.27
@@ -69,14 +69,14 @@ public slots:
         void loadSkin(const QString &file);
         void readConfig();
-        void switchToDockmode(void);
-        void returnFromDockmode(void);
+        void switchToDockmode();
+        void returnFromDockmode();
 
 protected:
-        void unloadSkin(void);
-        void showSplash(void);
+        void unloadSkin();
+        void showSplash();
 
 public slots:
-        void timeUpdate(void);
-        void newSong(void);
+        void timeUpdate();
+        void newSong();
 
 private slots:
@@ -105,10 +105,10 @@ public:
 
 private:
-        /* ==== docking stuff ==== */
+        // ==== docking stuff ====
         KWinModule *mWin;
         WId mDockToWin;
         int mDockPositionX, mDockPositionY, mDockPosition;
         QRect mDockWindowRect;
-        /* ==== end of docking stuff ==== */
+        // ==== end of docking stuff ====
         bool moving;
         QPoint mMousePoint;


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