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

List:       kde-commits
Subject:    branches/extragear/graphics/digikam/1.0-databaseext/libs
From:       Holger Foerster <hamsi2k () freenet ! de>
Date:       2010-02-08 21:42:04
Message-ID: 1265665324.340491.21386.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1087360 by foerster:

Clean up the GUI.

 M  +19 -4     dialogs/migrationdlg.cpp  
 M  +3 -3      widgets/common/databasewidget.cpp  


--- branches/extragear/graphics/digikam/1.0-databaseext/libs/dialogs/migrationdlg.cpp \
#1087359:1087360 @@ -32,6 +32,7 @@
 #include <qsqlquery.h>
 #include <qmap.h>
 #include <qsqlerror.h>
+#include <qlabel.h>
 
 // KDE includes
 #include <klocale.h>
@@ -83,12 +84,21 @@
         migrateButton                   = new QPushButton(i18n("Migrate ->"), this);
         cancelButton                    = new QPushButton(i18n("Cancel"), this);
         cancelButton->setEnabled(false);
-        progressBar                     = new QProgressBar(this);
+
+        QGroupBox *progressBox = new QGroupBox(i18n("Progress Information"), this);
+        QVBoxLayout *vlay         = new QVBoxLayout(progressBox);
+
+        progressBar                     = new QProgressBar(progressBox);
         progressBar->setTextVisible(true);
         progressBar->setRange(0,13);
-        progressBarSmallStep            = new QProgressBar(this);
+        progressBarSmallStep            = new QProgressBar(progressBox);
         progressBarSmallStep->setTextVisible(true);
 
+        vlay->addWidget(new QLabel(i18n("Overall Progress"), progressBox));
+        vlay->addWidget(progressBar);
+        vlay->addWidget(new QLabel(i18n("Step Progress"), progressBox));
+        vlay->addWidget(progressBarSmallStep);
+
         QWidget *mainWidget     = new QWidget;
         QGridLayout *layout     = new QGridLayout;
         mainWidget->setLayout(layout);
@@ -97,12 +107,16 @@
         layout->addWidget(migrateButton,1,1);
         layout->addWidget(cancelButton,2,1);
         layout->addWidget(toDatabaseWidget, 0,2, 4,1);
-        layout->addWidget(progressBar, 4,0, 1,3);
-        layout->addWidget(progressBarSmallStep, 5,0, 1,3);
+        layout->addWidget(progressBox, 4,0, 1,3);
+//        layout->addWidget(progressBar, 4,0, 1,3);
+//        layout->addWidget(progressBarSmallStep, 5,0, 1,3);
 
         setMainWidget(mainWidget);
         dataInit();
 
+        // setup dialog
+        setButtons(Close);
+
         connect(migrateButton, SIGNAL(clicked()), this, SLOT(performCopy()));
 
 
@@ -114,6 +128,7 @@
 
         connect(cancelButton, SIGNAL(clicked()), &(thread->copyManager), \
SLOT(stopThread()));  
+        this->connect(cancelButton, SIGNAL(closeClicked()), &(thread->copyManager), \
SLOT(stopThread()));  }
 
     void MigrationDlg::performCopy()
--- branches/extragear/graphics/digikam/1.0-databaseext/libs/widgets/common/databasewidget.cpp \
#1087359:1087360 @@ -75,11 +75,11 @@
 
         QLabel *databaseTypeLabel        = new QLabel(i18n("Type"));
         databaseType                  = new QComboBox();
-        QLabel *internalServerLabel        = new QLabel(i18n("Interner Server"));
+        QLabel *internalServerLabel        = new QLabel(i18n("Internal Server"));
         internalServer        = new QCheckBox();
         QLabel *databaseNameLabel        = new QLabel(i18n("Schema Name"));
         databaseName                  = new QLineEdit();
-        QLabel *databaseNameThumbnailsLabel = new QLabel(i18n("Thumbnails Schema \
Name")); +        QLabel *databaseNameThumbnailsLabel = new \
QLabel(i18n("Thumbnails<br>Schema Name"));  databaseNameThumbnails        = new \
QLineEdit();  QLabel *hostNameLabel            = new QLabel(i18n("Host Name"));
         hostName                      = new QLineEdit();
@@ -87,7 +87,7 @@
         hostPort                      = new QSpinBox();
         hostPort->setMaximum(65536);
 
-        QLabel *connectionOptionsLabel   = new QLabel(i18n("Database Connection \
Options")); +        QLabel *connectionOptionsLabel   = new \
QLabel(i18n("Database<br>Connection<br>Options"));  connectionOptions             = \
new QLineEdit();  
         QLabel *userNameLabel            = new QLabel(i18n("User"));


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