[Digikam-devel] extragear/graphics/digikam/libs/imageproperties

[Gilles Caulier]

SVN commit 500140 by cgilles:

digikam from trunk : image properties side bar BUGFIX : and another one : When setup dialog is closed, we invalidate current album item name in Navigate Bar using an empty string, not QString::null with NavigateBarWidget::setFileName(QString filename) method. This is can done any impredectible results with indeep crash...
CCMAIL: digikam-devel at kde.org

 M  +9 -10     imagedescedittab.cpp  
 M  +2 -2      imagepropertiescolorstab.cpp  
 M  +1 -1      imagepropertiescolorstab.h  
 M  +3 -3      imagepropertiesexiftab.cpp  
 M  +1 -1      imagepropertiesexiftab.h  
 M  +2 -2      navigatebarwidget.cpp  
 M  +7 -7      navigatebarwidget.h  


--- trunk/extragear/graphics/digikam/libs/imageproperties/imagedescedittab.cpp #500139:500140
@@ -311,6 +311,7 @@
 
         return false;
     }
+    
     return false;
 }
 
@@ -409,23 +410,23 @@
     applyChanges();
     
     if (d->view)
-       {        
+    {        
        disconnect(d->view, SIGNAL(signalItemDeleted(AlbumIconItem*)),
                   this, SLOT(slotItemDeleted(AlbumIconItem*)));
         
        disconnect(d->view, SIGNAL(signalCleared()),
                   this, SLOT(slotCleared()));
-       }
+    }
                 
     if (!currItem || !view)
-       {
-       d->navigateBar->setFileName("");
+    {
+       d->navigateBar->setFileName();
        d->commentsEdit->clear();
        d->view     = 0;
        d->currItem = 0;
        setEnabled(false);
        return;
-       }
+    }
 
     setEnabled(true);
     d->view     = view;
@@ -589,10 +590,9 @@
         return;
     }
 
-    int result =
-        KMessageBox::warningContinueCancel(this, i18n("Delete '%1' tag?")
-                                           .arg(album->title()),i18n("Delete Tag"),
-                                           KGuiItem(i18n("Delete"), "editdelete"));
+    int result = KMessageBox::warningContinueCancel(this, i18n("Delete '%1' tag?")
+                                                    .arg(album->title()),i18n("Delete Tag"),
+                                                    KGuiItem(i18n("Delete"), "editdelete"));
 
     if (result == KMessageBox::Continue)
     {
@@ -883,7 +883,6 @@
 TAlbumListView::TAlbumListView(QWidget* parent)
     : QListView(parent)
 {
-    
 }
 
 void TAlbumListView::emitSignalItemStateChanged()
--- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiescolorstab.cpp #500139:500140
@@ -1,7 +1,7 @@
 /* ============================================================
  * Author: Caulier Gilles <caulier dot gilles at free.fr>
  * Date  : 2004-11-17
- * Description :
+ * Description : A tab to display Colors image informations
  *
  * Copyright 2004-2006 by Gilles Caulier
  *
@@ -433,7 +433,7 @@
     
     if (url.isEmpty())
     {
-       d->navigateBar->setFileName("");
+       d->navigateBar->setFileName();
        d->labelMeanValue->clear();
        d->labelPixelsValue->clear();
        d->labelStdDevValue->clear();
--- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiescolorstab.h #500139:500140
@@ -1,7 +1,7 @@
 /* ============================================================
  * Author: Caulier Gilles <caulier dot gilles at free.fr>
  * Date  : 2004-11-17
- * Description :
+ * Description : A tab to display Colors image informations
  *
  * Copyright 2004-2006 by Gilles Caulier
  *
--- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiesexiftab.cpp #500139:500140
@@ -1,7 +1,7 @@
 /* ============================================================
  * Author: Caulier Gilles <caulier dot gilles at free.fr>
  * Date  : 2004-11-17
- * Description :
+ * Description : A tab to display Exif image informations
  *
  * Copyright 2004-2006 by Gilles Caulier
  *
@@ -70,7 +70,7 @@
     d->navigateBar  = new NavigateBarWidget(this, navBar);
     topLayout->addMultiCellWidget(d->navigateBar, 0, 0, 0, 2);
         
-    QLabel* levelLabel = new QLabel(i18n("Select level of detail:"), this);
+    QLabel* levelLabel = new QLabel(i18n("Level of detail:"), this);
     d->levelCombo      = new QComboBox(this);
     topLayout->addMultiCellWidget(levelLabel, 1, 1, 0, 1);
     topLayout->addMultiCellWidget(d->levelCombo, 1, 1, 2, 2);
@@ -125,7 +125,7 @@
     if (url.isEmpty())
     {
        d->exifWidget->loadFile(url.path());
-       d->navigateBar->setFileName("");
+       d->navigateBar->setFileName();
        setEnabled(false);
        return;
     }
--- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertiesexiftab.h #500139:500140
@@ -1,7 +1,7 @@
 /* ============================================================
  * Author: Caulier Gilles <caulier dot gilles at free.fr>
  * Date  : 2004-11-17
- * Description :
+ * Description : A tab to display Exif image informations
  *
  * Copyright 2004-2006 by Gilles Caulier
  *
--- trunk/extragear/graphics/digikam/libs/imageproperties/navigatebarwidget.cpp #500139:500140
@@ -1,9 +1,9 @@
 /* ============================================================
  * Author: Gilles Caulier <caulier dot gilles at free.fr>
  * Date  : 2005-07-07
- * Description : 
+ * Description : A button bar to navigate between album items
  * 
- * Copyright 2005 by Gilles Caulier
+ * Copyright 2005-2006 by Gilles Caulier
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
--- trunk/extragear/graphics/digikam/libs/imageproperties/navigatebarwidget.h #500139:500140
@@ -1,10 +1,10 @@
 /* ============================================================
  * Author: Gilles Caulier <caulier dot gilles at free.fr>
  * Date  : 2005-07-07
- * Description :
- * 
- * Copyright 2005 by Gilles Caulier
+ * Description : A button bar to navigate between album items
  *
+ * Copyright 2005-2006 by Gilles Caulier
+ *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
@@ -43,9 +43,9 @@
 
     enum CurrentItemPosition
     {
-    ItemCurrent=0,
-    ItemFirst,
-    ItemLast
+        ItemCurrent=0,
+        ItemFirst,
+        ItemLast
     };
 
 public:
@@ -53,7 +53,7 @@
     NavigateBarWidget(QWidget *parent=0, bool show=true);
     ~NavigateBarWidget();
     
-    void setFileName(QString filename);
+    void setFileName(QString filename=QString::null);
     void setButtonsState(int itemType);
 
 signals: