Fix possible crash on create / edit / remove profile

svn path=/branches/KDE4/; revision=2628

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index 0637fcda3ffbe3be40ffffb48f60c304842af4e8..e0cdcab5ed2dd06565242fc504f346e932bdbed1 100644 (file)
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -79,6 +79,8 @@ RenderWidget::RenderWidget(QWidget * parent): QDialog(parent) {
     parseProfiles();
     m_view.splitter->setStretchFactor(1, 5);
     m_view.splitter->setStretchFactor(0, 2);
+
+    focusFirstVisibleItem();
 }
 
 void RenderWidget::showInfoPanel() {
@@ -147,7 +149,7 @@ void RenderWidget::slotSaveProfile() {
     ui.parameters->setText(m_view.advanced_params->toPlainText());
     ui.extension->setText(m_view.size_list->currentItem()->data(ExtensionRole).toString());
     ui.profile_name->setFocus();
-    if (d->exec() == QDialog::Accepted) {
+    if (d->exec() == QDialog::Accepted && !ui.profile_name->text().simplified().isEmpty()) {
         QString exportFile = KStandardDirs::locateLocal("appdata", "export/customprofiles.xml");
         QDomDocument doc;
         QFile file(exportFile);
@@ -157,7 +159,7 @@ void RenderWidget::slotSaveProfile() {
         QDomElement documentElement;
         bool groupExists = false;
         QString groupName;
-        QString newProfileName = ui.profile_name->text();
+        QString newProfileName = ui.profile_name->text().simplified();
         QString newGroupName = ui.group_name->currentText();
         QDomNodeList groups = doc.elementsByTagName("group");
         int i = 0;
@@ -323,6 +325,19 @@ void RenderWidget::slotDeleteProfile() {
     out << doc.toString();
     file.close();
     parseProfiles(currentGroup);
+    focusFirstVisibleItem();
+}
+
+void RenderWidget::focusFirstVisibleItem() {
+    if (m_view.size_list->currentItem() && !m_view.size_list->currentItem()->isHidden()) return;
+    for (uint ix = 0; ix < m_view.size_list->count(); ix++) {
+       QListWidgetItem *item = m_view.size_list->item(ix);
+       if (item && !item->isHidden()) {
+           m_view.size_list->setCurrentRow(ix);
+           break;
+       }
+    }
+    if (!m_view.size_list->currentItem()) m_view.size_list->setCurrentRow(0);
 }
 
 void RenderWidget::slotExport() {
@@ -359,7 +374,7 @@ void RenderWidget::setDocumentStandard(QString std) {
 void RenderWidget::refreshView() {
     QListWidgetItem *item = m_view.format_list->currentItem();
     if (!item) {
-        m_view.format_list->setCurrentRow(0);
+       m_view.format_list->setCurrentRow(0);
         item = m_view.format_list->currentItem();
     }
     if (!item) return;
@@ -381,6 +396,7 @@ void RenderWidget::refreshView() {
             }
         } else sizeItem->setHidden(true);
     }
+    focusFirstVisibleItem();
 
 }
 

diff --git a/src/renderwidget.h b/src/renderwidget.h
index e3aed4bd20034c10d014076139b3a8006bbd7544..1acf590ed249ded28ce76f620e09d9999a82273b 100644 (file)
--- a/src/renderwidget.h
+++ b/src/renderwidget.h
@@ -33,6 +33,7 @@ public:
     RenderWidget(QWidget * parent = 0);
     void setDocumentStandard(QString std);
     void setGuides(QDomElement guidesxml, double duration);
+    void focusFirstVisibleItem();
 
 private slots:
     void slotUpdateButtons();