[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/0.9.1-15-gbfdccff

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 882a88f379270b6763cb98247c600f7875791d2d
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Mar 31 03:57:06 2009 +0300

    Some layouting improvements for choicepage.
    
    It still blinks annoyingly on startup though.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>

diff --git a/choicepage.cpp b/choicepage.cpp
index a4c72e0..d5dd06a 100644
--- a/choicepage.cpp
+++ b/choicepage.cpp
@@ -154,20 +154,18 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
 
   if(s.kdehomeDir().exists()) //if no kdedir, nothing to backup.
   {
-    d->freewarning = new QLabel(
-        tr("<p><b>Warning:</b> Insufficient free space to complete a backup, "
-        "please consider freeing up some space. You can go to TTY1 to do this.</p>"), this);
+    d->freewarning = new QLabel(this);
     d->freewarning->setWordWrap(true);
     d->freewarning->hide();
-    lay->addWidget(d->freewarning);
 
     QHBoxLayout *hlay = new QHBoxLayout;
     d->progresswidget = new ProgressWidget(this);
     hlay->addWidget(d->progresswidget);
     d->recheck = new QPushButton(tr("Check again"));
-    hlay->addWidget(d->recheck);
+    hlay->addWidget(d->recheck, 0, Qt::AlignBottom);
     connect(d->recheck,SIGNAL(clicked()),this,SLOT(checkSpaceForBackup()));
     lay->addLayout(hlay);
+    lay->addWidget(d->freewarning);
   }
   else
   {
@@ -186,6 +184,17 @@ bool ChoicePage::backupSelected() const
   return d->backup ? d->backup->isChecked() : false;
 }
 
+void ChoicePage::setFreeWarningText(bool show)
+{
+    d->freewarning->setText((show) ?
+        tr("<p><strong>Warning:</strong> Insufficient free space to complete a backup. "
+        "Consider freeing up some space.") : QString::null);
+    d->freewarning->setToolTip((show) ?
+        tr("To free up some disk case, cancel the wizard now or switch to virtual terminal.") :
+        QString::null);
+    if (show) d->freewarning->show();
+}
+
 void ChoicePage::checkSpaceForBackup()
 {
   Q_ASSERT(KaboomSettings::instance().kdehomeDir().exists());
@@ -195,10 +204,11 @@ void ChoicePage::checkSpaceForBackup()
   wizard()->button(QWizard::NextButton)->setEnabled(false);
 
   d->progresswidget->show();
+  d->progresswidget->setToolTip(QString::null);
   d->recheck->hide();
-  d->freewarning->hide();
   d->backup->setEnabled(false);
   d->backup->setChecked(false);
+  setFreeWarningText(false);
 
   quint64 dirsize = -1;
   quint64 freespace = DirOperations::freeDirSpace(QDir::homePath());
@@ -218,13 +228,15 @@ void ChoicePage::checkSpaceForBackup()
         tr("<p><i>The current KDE&nbsp;3 settings and data directory takes up %1</i></p>")
             .arg(DirOperations::bytesToString(dirsize))
     );
+    d->progresswidget->setToolTip(tr("% of disk space currently used"));
     d->recheck->show();
-    d->freewarning->show();
+    setFreeWarningText(true);
   }
   else
   {
     d->progresswidget->hide();
     d->recheck->hide();
+    d->freewarning->hide();
     d->backup->setEnabled(true);
     d->backup->setChecked(true);
   }
diff --git a/choicepage.h b/choicepage.h
index ae98e8f..17ef15f 100644
--- a/choicepage.h
+++ b/choicepage.h
@@ -30,6 +30,7 @@ class ChoicePage : public QWizardPage
     void initializePage();
   private slots:
     void checkSpaceForBackup();
+    void setFreeWarningText(bool show);
   private:
     ChoicePagePrivate *d;
 

-- 
Kaboom - Debian KDE 3->4 migration tool