1) Additional work on tq app -> tde app translation (tq -> TDE actions)

2) Added "Quit All" command to popup menu.

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 8 insertions, 14 deletions

diff --git a/src/customtraylabel.h b/src/customtraylabel.h
index 244ebc2..8206a52 100644
--- a/src/customtraylabel.h
+++ b/src/customtraylabel.h
@@ -23,12 +23,12 @@
 #define _CUSTOMTRAYLABEL_H
 
 #include <tqobject.h>
-#include <tqaction.h>
+#include <tdeactionclasses.h>
 #include "qtraylabel.h"
 
-class TQStringList;
-class TQPopupMenu;
 class TDEPopupMenu;
+class TDEToggleAction;
+class TQStringList;
 class TQString;
 class TQSettings;
 class TQWidget;
@@ -46,17 +46,10 @@ public:
   bool saveState(TDEConfig *config);
   bool restoreState(TDEConfig *config);
 
-  bool isDockWhenObscured(void) const { return mDockWhenObscured->isOn(); }
-  
   void setAppName(const TQString& name);
 
 public slots:
-  // overridden to update our menu
-  void setDockWhenMinimized(bool dwm);
-  void setDockWhenFocusLost(bool dfl) { mDockWhenFocusLost->setOn(dfl); }
-  void setSkipTaskbar(bool skip);
-
-  void setDockWhenObscured(bool dock) { mDockWhenObscured->setOn(dock); }
+  void setDockWhenObscured(bool dock) { mDockWhenObscured->setChecked(dock); }
   void enableSessionManagement(bool sm);
   
 protected:
@@ -78,10 +71,11 @@ private slots:
 private:
   void installMenu();
   bool mUndockWhenDead;
-  TQPopupMenu *mMainMenu;
+  TDEPopupMenu *mMainMenu;
   TDEPopupMenu *mOptionsMenu;
-  TQAction *mDockOnRestore, *mBalloonTimeout, *mSkipTaskbar, *mDockWhenMinimized,
-           *mDockWhenObscured, *mSessionManagement, *mDockWhenFocusLost;
+  TDEToggleAction *mSessionManagement, *mDockWhenObscured, *mDockIfMinimized,
+                  *mDockWhenFocusLost, *mSkipTaskbar;
+  TDEAction *mBalloonTimeout;
   int mShowId;
 };