1 files changed, 65 insertions, 34 deletions

diff --git a/twin/kcmtwin/twinoptions/windows.h b/twin/kcmtwin/twinoptions/windows.h
index d4d358e9a..80c9e76d7 100644
--- a/twin/kcmtwin/twinoptions/windows.h
+++ b/twin/kcmtwin/twinoptions/windows.h
@@ -50,9 +50,6 @@ class KIntNumInput;
 #define TITLEBAR_PLAIN  0
 #define TITLEBAR_SHADED 1
 
-#define RESIZE_TRANSPARENT  0
-#define RESIZE_OPAQUE       1
-
 #define SMART_PLACEMENT        0
 #define MAXIMIZING_PLACEMENT   1
 #define CASCADE_PLACEMENT      2
@@ -68,10 +65,11 @@ class KIntNumInput;
 #define  FOCUS_STRICTLY_UNDER_MOUSE   3
 
 class TQSpinBox;
+class TQHBox;
 
 class KFocusConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KFocusConfig( bool _standAlone, TDEConfig *_config, TQWidget *parent=0, const char* name=0 );
   ~KFocusConfig();
@@ -88,7 +86,7 @@ private slots:
   void clickRaiseOnTog(bool);
   void updateAltTabMode();
   void updateActiveMouseScreen();
-	void changed() { emit TDECModule::changed(true); }
+  void changed() { emit TDECModule::changed(true); }
 
 
 private:
@@ -134,7 +132,7 @@ private:
 
 class KMovingConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KMovingConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
   ~KMovingConfig();
@@ -146,32 +144,34 @@ public:
 private slots:
   void setMinimizeAnim( bool );
   void setMinimizeAnimSpeed( int );
-	void changed() { emit TDECModule::changed(true); }
+  void changed() { emit TDECModule::changed(true); }
   void slotBrdrSnapChanged( int );
   void slotWndwSnapChanged( int );
 
 private:
-  int getMove( void );
+  int  getMoveMode( void );
+  int  getResizeMode ( void );
   bool getMinimizeAnim( void );
-  int getMinimizeAnimSpeed( void );
-  int getResizeOpaque ( void );
+  int  getMinimizeAnimSpeed( void );
   bool getGeometryTip( void ); //KS
-  int getPlacement( void ); //CT
+  int  getPlacement( void ); //CT
 
-  void setMove(int);
-  void setResizeOpaque(int);
+  void setMoveMode(int);
+  void setResizeMode(int);
   void setGeometryTip(bool); //KS
   void setPlacement(int); //CT
   void setMoveResizeMaximized(bool);
+  void setResetMaximizedWindowGeometry(bool);
 
   TQButtonGroup *windowsBox;
-  TQCheckBox *opaque;
-  TQCheckBox *resizeOpaqueOn;
+  TQCheckBox *moveOpaque;
+  TQCheckBox *resizeOpaque;
   TQCheckBox *geometryTipOn;
-  TQCheckBox* minimizeAnimOn;
+  TQCheckBox *minimizeAnimOn;
   TQSlider *minimizeAnimSlider;
   TQLabel *minimizeAnimSlowLabel, *minimizeAnimFastLabel;
   TQCheckBox *moveResizeMaximized;
+  TQCheckBox *resetMaximizedWindowGeometry;
 
   TQComboBox *placementCombo;
 
@@ -189,9 +189,54 @@ private:
 
 };
 
+class KActiveBorderConfig : public TDECModule
+{
+    TQ_OBJECT
+    public:
+        KActiveBorderConfig(bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char *name = 0);
+        ~KActiveBorderConfig();
+
+        void load();
+        void save();
+        void defaults();
+
+    private slots:
+        // copied from kcontrol/konq/twindesktop, aleXXX
+        // original name: setEBorders()
+        void updateActiveBorders();
+
+        void changed() { emit TDECModule::changed(true); }
+
+    private:
+        int getActiveBorders();
+        int getActiveBorderDelay();
+        int getActiveBorderDistance();
+        int getTilingMode();
+
+        void setActiveBorders(int);
+        void setActiveBorderDelay(int);
+        void setActiveBorderDistance(int);
+        void setTilingMode(int);
+
+        TQButtonGroup *active_box;
+        TQRadioButton *active_disable;
+        TQRadioButton *active_desktop;
+        TQCheckBox *active_move;
+        TQRadioButton *active_tile;
+        TQCheckBox *active_maximize;
+        KIntNumInput *delays;
+        KIntNumInput *distance;
+        TQWidget *active_desktop_conf;
+        TQWidget *active_tile_conf;
+        TQCheckBox *tilingOpaque;
+
+        TDEConfig *config;
+        bool standAlone;
+};
+
 class KAdvancedConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KAdvancedConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
   ~KAdvancedConfig();
@@ -203,9 +248,6 @@ public:
 private slots:
   void shadeHoverChanged(bool);
 
-  //copied from kcontrol/konq/twindesktop, aleXXX
-  void setEBorders();
-
   void changed() { emit TDECModule::changed(true); }
 
 private:
@@ -223,17 +265,6 @@ private:
   TDEConfig *config;
   bool     standAlone;
 
-  int getElectricBorders( void );
-  int getElectricBorderDelay();
-  void setElectricBorders( int );
-  void setElectricBorderDelay( int );
-
-  TQVButtonGroup *electricBox;
-  TQRadioButton *active_disable;
-  TQRadioButton *active_move;
-  TQRadioButton *active_always;
-  KIntNumInput *delays;
-  
   void setHideUtilityWindowsForInactive( bool );
 
   TQCheckBox* hideUtilityWindowsForInactive;
@@ -242,15 +273,15 @@ private:
 class TDEProcess;
 class KTranslucencyConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KTranslucencyConfig( bool _standAlone, TDEConfig *config, TQWidget *parent=0, const char* name=0 );
   ~KTranslucencyConfig();
-  
+
   void load();
   void save();
   void defaults();
-  
+
 private:
   TQCheckBox *useTranslucency;
   TQCheckBox *activeWindowTransparency;