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

List:       kde-commits
Subject:    kdeutils/klaptopdaemon
From:       Martin Koller <m.koller () surfeu ! at>
Date:       2004-12-01 17:52:06
Message-ID: 20041201175206.139C51B94B () office ! kde ! org
[Download RAW message or body]

CVS commit by mkoller: 

BUG 80140:
BUG 67861: Don't set a fixed width to allow resize to smaller width


  M +1 -12     portable.cpp   1.91
  M +1 -2      warning.cpp   1.31


--- kdeutils/klaptopdaemon/portable.cpp  #1.90:1.91
@@ -923,5 +923,4 @@ KActiveLabel *laptop_portable::no_power_
         if (access("/proc/acpi", F_OK) == 0) {  // probably has default kernel ACPI \
installed  KActiveLabel* explain = new KActiveLabel(i18n("Your computer seems to have \
a partial ACPI installation. ACPI was probably enabled, but some of the sub-options \
were not - you need to enable at least 'AC Adaptor' and 'Control Method Battery' and \
                then rebuild your kernel."), parent);
-                explain->setMinimumSize(explain->sizeHint());       
                 return(explain);
         }
@@ -929,5 +928,4 @@ KActiveLabel *laptop_portable::no_power_
         KActiveLabel* explain = new KActiveLabel(i18n("Your computer doesn't have \
the Linux APM (Advanced Power Management) or ACPI software installed, or doesn't have \
the APM kernel drivers installed - check out the <a \
href=\"http://www.linuxdoc.org/HOWTO/Laptop-HOWTO.html\">Linux Laptop-HOWTO</a> \
document for information on how to install APM."), parent);  
-        explain->setMinimumSize(explain->sizeHint());       
         return(explain);
 }
@@ -943,5 +941,4 @@ QLabel *laptop_portable::how_to_do_suspe
                                                 "dialog - check out the help button \
                below to find out "
                                                 "how to do this"), parent);
-                note->setMinimumSize(note->sizeHint());
                 note->setAlignment( Qt::WordBreak );
                 return(note);
@@ -949,10 +946,8 @@ QLabel *laptop_portable::how_to_do_suspe
         if (::has_acpi()) {
                 QLabel* note = new QLabel(i18n("\nYou may need to enable ACPI \
                suspend/resume in the ACPI panel"), parent);
-                note->setMinimumSize(note->sizeHint());
                 note->setAlignment( Qt::WordBreak );
                 return(note);
         }
         QLabel* note = new QLabel(i18n("\nYour system does not support \
                suspend/standby"), parent);
-        note->setMinimumSize(note->sizeHint());
         note->setAlignment( Qt::WordBreak );
         return(note);
@@ -2152,5 +2147,4 @@ KActiveLabel *laptop_portable::no_power_
   }
   
-  explain->setMinimumSize(explain->sizeHint());       
   return(explain);
 }
@@ -2162,5 +2156,4 @@ QLabel *laptop_portable::how_to_do_suspe
 {
         QLabel* note = new QLabel(i18n(" "), parent);
-        note->setMinimumSize(note->sizeHint()); 
         return(note);
 }
@@ -2559,5 +2552,4 @@ KActiveLabel *laptop_portable::no_power_
   }
   
-  explain->setMinimumSize(explain->sizeHint());       
   return(explain);
 }
@@ -2570,5 +2562,4 @@ QLabel *laptop_portable::how_to_do_suspe
         // INSERT HERE
        QLabel* note = new QLabel(i18n(" "), parent);
-        note->setMinimumSize(note->sizeHint()); 
        return(note);
 }
@@ -2855,5 +2846,4 @@ KActiveLabel *laptop_portable::no_power_
         KActiveLabel* explain = new KActiveLabel(i18n("Your computer or operating \
system is not supported by the current version of the\nKDE laptop control panels. If \
you want help porting these panels to work with it\nplease contact \
paul@taniwha.com."), parent);  // INSERT HERE
-        explain->setMinimumSize(explain->sizeHint());       
         return(explain);
 }
@@ -2866,5 +2856,4 @@ QLabel *laptop_portable::how_to_do_suspe
         QLabel* note = new QLabel(i18n(" "), parent);
         // INSERT HERE
-        note->setMinimumSize(note->sizeHint()); 
         return(note);
 }

--- kdeutils/klaptopdaemon/warning.cpp  #1.30:1.31
@@ -261,6 +261,5 @@ WarningConfig::WarningConfig (int t, QWi
       // display help text:
       QLabel* note = laptop_portable::how_to_do_suspend_resume(this);
-      grid->addMultiCellWidget(note, curRow, curRow, 0, 1,
-                               Qt::AlignLeft|Qt::AlignTop);
+      grid->addMultiCellWidget(note, curRow, curRow, 0, 1);
       ++curRow;
     }


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