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

List:       kde-commits
Subject:    branches/extragear/graphics/digikam
From:       Marcel Wiesweg <marcel.wiesweg () gmx ! de>
Date:       2010-09-30 21:01:21
Message-ID: 20100930210121.884D7AC891 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1181379 by mwiesweg:

Some changes to make subclassing more flexible


 M  +3 -0      digikam/albumselectcombobox.cpp  
 M  +11 -3     libs/widgets/common/comboboxutilities.cpp  
 M  +2 -0      libs/widgets/common/comboboxutilities.h  
 M  +2 -2      utilities/searchwindow/choicesearchutilities.cpp  
 M  +1 -1      utilities/searchwindow/choicesearchutilities.h  


--- branches/extragear/graphics/digikam/digikam/albumselectcombobox.cpp #1181378:1181379
@@ -112,6 +112,9 @@
 
 void AlbumSelectComboBox::installView(QAbstractItemView *v)
 {
+    if (view())
+        return;
+
     TreeViewLineEditComboBox::installView(v);
     view()->setSortingEnabled(true);
     view()->sortByColumn(0, Qt::AscendingOrder);
--- branches/extragear/graphics/digikam/libs/widgets/common/comboboxutilities.cpp #1181378:1181379
@@ -216,6 +216,9 @@
 
 void StayPoppedUpComboBox::installView(QAbstractItemView *view)
 {
+    if (m_view)
+        return;
+
     // Create view
     m_view = view;
 
@@ -389,10 +392,15 @@
 
 void TreeViewLineEditComboBox::installLineEdit()
 {
-    // replace line edit
-    m_comboLineEdit = new TreeViewComboBoxLineEdit(this);
-    setLineEdit(m_comboLineEdit);
+    if (!m_comboLineEdit)
+        setLineEdit(new TreeViewComboBoxLineEdit(this));
 }
 
+void TreeViewLineEditComboBox::setLineEdit(QLineEdit *edit)
+{
+    m_comboLineEdit = edit;
+    TreeViewComboBox::setLineEdit(edit);
+}
+
 } // namespace Digikam
 
--- branches/extragear/graphics/digikam/libs/widgets/common/comboboxutilities.h #1181378:1181379
@@ -267,6 +267,8 @@
     */
     void setLineEditText(const QString& text);
 
+    void setLineEdit(QLineEdit *edit);
+
 protected:
 
     /** Sets a line edit. Called by installView().
--- branches/extragear/graphics/digikam/utilities/searchwindow/choicesearchutilities.cpp #1181378:1181379
@@ -232,10 +232,10 @@
     showPopup();
 }
 
-void ChoiceSearchComboBox::installView()
+void ChoiceSearchComboBox::installView(QAbstractItemView *v)
 {
     // make protected again
-    ListViewComboBox::installView();
+    ListViewComboBox::installView(v);
 
     //view()->setHeaderHidden(true);
     view()->setAlternatingRowColors(true);
--- branches/extragear/graphics/digikam/utilities/searchwindow/choicesearchutilities.h #1181378:1181379
@@ -194,7 +194,7 @@
 
 protected:
 
-    virtual void installView();
+    virtual void installView(QAbstractItemView *view = 0);
 
 protected:
 
[prev in list] [next in list] [prev in thread] [next in thread]