Index: scribus/ui/colorcombo.cpp
===================================================================
--- scribus/ui/colorcombo.cpp	(Revision 26191)
+++ scribus/ui/colorcombo.cpp	(Arbeitskopie)
@@ -15,14 +15,7 @@
 #include "commonstrings.h"
 // #include "qdebug.h"
 
-ColorCombo::ColorCombo(QWidget* parent) : QComboBox(parent)
-{
-	setEditable(false);
-	ColorListBox* lb = new ColorListBox(this);
-	setModel( lb->model() );
-	setItemDelegate( lb->itemDelegate() );
-	setView( lb );
-}
+ColorCombo::ColorCombo(QWidget* parent) : ColorCombo(false, parent) {}
 
 ColorCombo::ColorCombo(ColorCombo::PixmapType type, QWidget* parent) : QComboBox(parent)
 {
@@ -36,6 +29,7 @@
 	setModel( lb->model() );
 	setItemDelegate( lb->itemDelegate() );
 	setView( lb );
+	view()->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
 }
 
 ColorCombo::ColorCombo(bool rw, QWidget* parent) : QComboBox(parent)
@@ -45,6 +39,7 @@
 	setModel( lb->model() );
 	setItemDelegate( lb->itemDelegate() );
 	setView( lb );
+	view()->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
 }
 
 
Index: scribus/ui/colorlistbox.cpp
===================================================================
--- scribus/ui/colorlistbox.cpp	(Revision 26191)
+++ scribus/ui/colorlistbox.cpp	(Arbeitskopie)
@@ -175,22 +175,8 @@
 int ColorListBox::initialized;
 int ColorListBox::sortRule;
 
-ColorListBox::ColorListBox(QWidget * parent)
-	: QListView(parent)
-{
-	if (initialized != 12345)
-		sortRule = 0;
-	initialized = 12345;
-	QListView::setModel(new ColorListModel(this));
-	setPixmapType(ColorListBox::widePixmap);
+ColorListBox::ColorListBox(QWidget * parent) : ColorListBox(ColorListBox::widePixmap, parent) {}
 
-	connect(this, SIGNAL(clicked(QModelIndex)), this, SLOT(emitItemClicked(QModelIndex)));
-	connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(emitItemDoubleClicked(QModelIndex)));
-	connect(this->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(emitCurrentChanged(QModelIndex,QModelIndex)));
-	connect(this->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SIGNAL(itemSelectionChanged()));
-	connect(this, SIGNAL(contextMenuRequested()), this, SLOT(slotRightClick()));
-}
-
 ColorListBox::ColorListBox(ColorListBox::PixmapType type, QWidget * parent)
 	: QListView(parent)
 {
Index: scribus/ui/propertywidget_textcolor.cpp
===================================================================
--- scribus/ui/propertywidget_textcolor.cpp	(Revision 26191)
+++ scribus/ui/propertywidget_textcolor.cpp	(Arbeitskopie)
@@ -196,9 +196,6 @@
 	fillColor->setColors(m_doc->PageColors, true);
 	strokeColor->setColors(m_doc->PageColors, false);
 	backColor->setColors(m_doc->PageColors, true);
-	fillColor->view()->setMinimumWidth(fillColor->view()->maximumViewportSize().width() + 24);
-	strokeColor->view()->setMinimumWidth(strokeColor->view()->maximumViewportSize().width() + 24);
-	backColor->view()->setMinimumWidth(backColor->view()->maximumViewportSize().width() + 24);
 
 	if (m_item)
 		setCurrentItem(m_item);
Index: scribus/ui/search.cpp
===================================================================
--- scribus/ui/search.cpp	(Revision 26191)
+++ scribus/ui/search.cpp	(Arbeitskopie)
@@ -147,7 +147,6 @@
 	searchStrokeValue->setEditable(false);
 	searchStrokeValue->setPixmapType(ColorCombo::fancyPixmaps);
 	searchStrokeValue->setColors(doc->PageColors, true);
-	searchStrokeValue->view()->setMinimumWidth(searchStrokeValue->view()->maximumViewportSize().width() + 24);
 	setCurrentComboItem(searchStrokeValue, doc->currentStyle.charStyle().strokeColor());
 	searchStrokeValue->setEnabled(false);
 	SearchLayout->addWidget( searchStrokeValue, 8, 1 );
@@ -233,7 +232,6 @@
 	replaceFillValue->setEditable(false);
 	replaceFillValue->setPixmapType(ColorCombo::fancyPixmaps);
 	replaceFillValue->setColors(doc->PageColors, true);
-	replaceFillValue->view()->setMinimumWidth(replaceFillValue->view()->maximumViewportSize().width() + 24);
 	setCurrentComboItem(replaceFillValue, doc->currentStyle.charStyle().fillColor());
 	replaceFillValue->setEnabled(false);
 	ReplaceLayout->addWidget( replaceFillValue, 6, 1 );
@@ -244,7 +242,6 @@
 	replaceStrokeValue->setEditable(false);
 	replaceStrokeValue->setPixmapType(ColorCombo::fancyPixmaps);
 	replaceStrokeValue->setColors(doc->PageColors, true);
-	replaceStrokeValue->view()->setMinimumWidth(replaceStrokeValue->view()->maximumViewportSize().width() + 24);
 	setCurrentComboItem(replaceStrokeValue, doc->currentStyle.charStyle().strokeColor());
 	replaceStrokeValue->setEnabled(false);
 	ReplaceLayout->addWidget( replaceStrokeValue, 8, 1 );
Index: scribus/ui/smcellstylewidget.cpp
===================================================================
--- scribus/ui/smcellstylewidget.cpp	(Revision 26191)
+++ scribus/ui/smcellstylewidget.cpp	(Arbeitskopie)
@@ -173,5 +173,4 @@
 	fillColor->clear();
 
 	fillColor->setColors(colors, true);
-	fillColor->view()->setMinimumWidth(fillColor->view()->maximumViewportSize().width()+24);
 }
Index: scribus/ui/smcstylewidget.cpp
===================================================================
--- scribus/ui/smcstylewidget.cpp	(Revision 26191)
+++ scribus/ui/smcstylewidget.cpp	(Arbeitskopie)
@@ -167,9 +167,6 @@
 	fillColor_->setColors(colors, true);
 	strokeColor_->setColors(colors, true);
 	backColor_->setColors(colors, true);
-	fillColor_->view()->setMinimumWidth(fillColor_->view()->maximumViewportSize().width()+24);
-	strokeColor_->view()->setMinimumWidth(strokeColor_->view()->maximumViewportSize().width()+24);
-	backColor_->view()->setMinimumWidth(backColor_->view()->maximumViewportSize().width()+24);
 }
 
 void SMCStyleWidget::handleUpdateRequest(int updateFlags)
Index: scribus/ui/smpstylewidget.cpp
===================================================================
--- scribus/ui/smpstylewidget.cpp	(Revision 26191)
+++ scribus/ui/smpstylewidget.cpp	(Arbeitskopie)
@@ -185,7 +185,6 @@
 {
 	backColor_->clear();
 	backColor_->setColors(colors, true);
-	backColor_->view()->setMinimumWidth(backColor_->view()->maximumViewportSize().width()+24);
 }
 
 void SMPStyleWidget::fillBulletStrEditCombo()
Index: scribus/ui/smtablestylewidget.cpp
===================================================================
--- scribus/ui/smtablestylewidget.cpp	(Revision 26191)
+++ scribus/ui/smtablestylewidget.cpp	(Arbeitskopie)
@@ -170,7 +170,6 @@
 	fillColor->clear();
 
 	fillColor->setColors(colors, true);
-	fillColor->view()->setMinimumWidth(fillColor->view()->maximumViewportSize().width()+24);
 }
 
 
