r19958 by craig - Move page combo to standard QComboBox, widen it a little

[scribus-commit]

Author: craig
Date: Sun Mar 29 21:22:27 2015
New Revision: 19958

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19958
Log:
Move page combo to standard QComboBox, widen it a little

Modified:
    trunk/Scribus/scribus/scribus.css
    trunk/Scribus/scribus/ui/pageselector.cpp
    trunk/Scribus/scribus/ui/pageselector.h

Modified: trunk/Scribus/scribus/scribus.css
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19958&path=/trunk/Scribus/scribus/scribus.css
==============================================================================
--- trunk/Scribus/scribus/scribus.css (original)
+++ trunk/Scribus/scribus/scribus.css Sun Mar 29 21:22:27 2015
@@ -5,8 +5,8 @@
 
 /* page selector comboboxes */
 
-PageSelector QComboBox { border: 1px solid gray; height: 20px; width:2em; }
-PageSelector QComboBox::down-arrow { image: url(___downArrow___); width: 12px; height 12px;}
+PageSelector QComboBox { border: 1px solid gray; height: 20px; width: 3em; }
+PageSelector QComboBox::down-arrow { image: url(___downArrow___); width: 12px; height 12px; }
 PageSelector QComboBox::down-arrow:on { top: 1px; left: 1px; }
 PageSelector QComboBox:editable { background: white; }
 PageSelector QComboBox:!editable, QComboBox::drop-down:editable { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #E1E1E1, stop: 0.4 #DDDDDD, stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);}

Modified: trunk/Scribus/scribus/ui/pageselector.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19958&path=/trunk/Scribus/scribus/ui/pageselector.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pageselector.cpp (original)
+++ trunk/Scribus/scribus/ui/pageselector.cpp Sun Mar 29 21:22:27 2015
@@ -7,6 +7,7 @@
 #include "pageselector.h"
 
 #include <QByteArray>
+#include <QComboBox>
 #include <QDebug>
 #include <QEvent>
 #include <QHBoxLayout>
@@ -18,7 +19,6 @@
 #include <QToolTip>
 #include <QValidator>
 
-#include "sccombobox.h"
 #include "scpaths.h"
 #include "util_icon.h"
 #include "util.h"
@@ -61,7 +61,7 @@
 	backButton->setAutoRepeat(true);
 
 	m_validator = new QIntValidator(1, m_lastPage, this);
-	m_pageCombo = new ScComboBox( this );
+	m_pageCombo = new QComboBox( this );
 	m_pageCombo->setEditable(true);
 	m_pageCombo->setDuplicatesEnabled( false );
 	m_pageCombo->setInsertPolicy(QComboBox::NoInsert);

Modified: trunk/Scribus/scribus/ui/pageselector.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19958&path=/trunk/Scribus/scribus/ui/pageselector.h
==============================================================================
--- trunk/Scribus/scribus/ui/pageselector.h (original)
+++ trunk/Scribus/scribus/ui/pageselector.h Sun Mar 29 21:22:27 2015
@@ -19,7 +19,7 @@
 #include "scribusapi.h"
 #include "styleoptions.h"
 
-class ScComboBox;
+class QComboBox;
 
 class SCRIBUS_API PageSelector : public QWidget
 {
@@ -62,7 +62,7 @@
 	int m_lastPage;
 	int m_currentPage;
 
-	ScComboBox *m_pageCombo;
+	QComboBox *m_pageCombo;
 	QIntValidator *m_validator;
 
 signals: