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

List:       kde-commits
Subject:    kdebase
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2004-10-01 12:58:50
Message-ID: 20041001125850.5B4F49911 () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

Don't force the settings, only apply them initially.


  M +9 -9      kstart/kstart.cpp   1.59
  M +2 -1      kwin/rules.h   1.20


--- kdebase/kstart/kstart.cpp  #1.58:1.59
@@ -113,10 +113,10 @@ void KStart::sendRule() {
     if ( ( desktop > 0 && desktop <= kwinmodule->numberOfDesktops() )
          || desktop == NETWinInfo::OnAllDesktops ) {
-        message += "desktop=" + QCString().setNum( desktop ) + "\ndesktoprule=2\n";
+        message += "desktop=" + QCString().setNum( desktop ) + "\ndesktoprule=3\n";
     }
     if (activate)
         message += "fsplevel=0\nfsplevelrule=1\n";
     if (iconify)
-        message += "minimize=true\nminimizerule=2\n";
+        message += "minimize=true\nminimizerule=3\n";
     if ( windowtype != NET::Unknown ) {
         message += "type=" + QCString().setNum( windowtype ) + "\ntyperule=1";
@@ -124,17 +124,17 @@ void KStart::sendRule() {
     if ( state ) {
         if( state & NET::KeepAbove )
-            message += "above=true\naboverule=2\n";
+            message += "above=true\naboverule=3\n";
         if( state & NET::KeepBelow )
-            message += "below=true\nbelowrule=2\n";
+            message += "below=true\nbelowrule=3\n";
         if( state & NET::SkipTaskbar )
-            message += "skiptaskbar=true\nskiptaskbarrule=2\n";
+            message += "skiptaskbar=true\nskiptaskbarrule=3\n";
         if( state & NET::SkipPager )
-            message += "skippager=true\nskippagerrule=2\n";
+            message += "skippager=true\nskippagerrule=3\n";
         if( state & NET::MaxVert )
-            message += "maximizevert=true\nmaximizevertrule=2\n";
+            message += "maximizevert=true\nmaximizevertrule=3\n";
         if( state & NET::MaxHoriz )
-            message += "maximizehoriz=true\nmaximizehorizrule=2\n";
+            message += "maximizehoriz=true\nmaximizehorizrule=3\n";
         if( state & NET::FullScreen )
-            message += "fullscreen=true\nfullscreenrule=2\n";
+            message += "fullscreen=true\nfullscreenrule=3\n";
     }
 

--- kdebase/kwin/rules.h  #1.19:1.20
@@ -116,5 +116,6 @@ class Rules
         bool matchTitle( const QString& match_title ) const;
         bool matchClientMachine( const QCString& match_machine ) const;
-        enum // values are saved to the cfg file
+        // All these values are saved to the cfg file, and are also used in kstart!
+        enum
             {
             Unused = 0,


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