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

List:       kde-commits
Subject:    KDE/kdelibs/kdeprint/management
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2007-01-11 7:00:34
Message-ID: 1168498834.411332.23726.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 622246 by aseigo:

this almost looks normal again =)


 M  +0 -40     kmiconview.cpp  
 M  +0 -1      kmiconview.h  
 M  +15 -11    kminfopage.cpp  
 M  +12 -12    kmmainview.cpp  


--- trunk/KDE/kdelibs/kdeprint/management/kmiconview.cpp #622245:622246
@@ -46,46 +46,6 @@
 	Q3IconViewItem::paintItem(p,cg);
 }
 
-void KMIconViewItem::calcRect(const QString&)
-{
-	QRect	ir(rect()), pr, tr;
-
-	// pixmap rect
-	pr.setWidth(pixmap()->width());
-	pr.setHeight(pixmap()->height());
-
-	// text rect
-	QFont	f(iconView()->font());
-	if (m_state & 0x1) f.setBold(true);
-	if (m_state & 0x2) f.setItalic(true);
-	QFontMetrics	fm(f);
-	if (m_mode == Qt::DockBottom)
-		tr = fm.boundingRect(0, 0, iconView()->maxItemWidth(), 0xFFFFFF, \
                Qt::AlignHCenter|Qt::AlignTop|Qt::TextWordWrap|Qt::TextWrapAnywhere, \
                text()+'X');
-	else
-		tr = fm.boundingRect(0, 0, 0xFFFFFF, 0xFFFFFF, Qt::AlignLeft|Qt::AlignTop, \
                text()+'X');
-
-	// item rect
-	if (m_mode == Qt::DockBottom)
-	{
-		ir.setHeight(pr.height() + tr.height() + 15);
-		ir.setWidth(qMax(pr.width(), tr.width()) + 10);
-		pr = QRect((ir.width()-pr.width())/2, 5, pr.width(), pr.height());
-		tr = QRect((ir.width()-tr.width())/2, 10+pr.height(), tr.width(), tr.height());
-	}
-	else
-	{
-		ir.setHeight(qMax(pr.height(), tr.height()) + 4);
-		ir.setWidth(pr.width() + tr.width() + 6);
-		pr = QRect(2, (ir.height()-pr.height())/2, pr.width(), pr.height());
-		tr = QRect(4+pr.width(), (ir.height()-tr.height())/2, tr.width(), tr.height());
-	}
-
-	// set rects
-	setItemRect(ir);
-	setTextRect(tr);
-	setPixmapRect(pr);
-}
-
 void KMIconViewItem::updatePrinter(KMPrinter *p, int mode)
 {
 	bool	update(false);
--- trunk/KDE/kdelibs/kdeprint/management/kmiconview.h #622245:622246
@@ -36,7 +36,6 @@
 
 protected:
 	virtual void paintItem(QPainter*, const QColorGroup&);
-	virtual void calcRect(const QString& text_ = QString());
 
 private:
 	int		m_mode;
--- trunk/KDE/kdelibs/kdeprint/management/kminfopage.cpp #622245:622246
@@ -23,6 +23,7 @@
 #include <qpixmap.h>
 #include <qlabel.h>
 #include <qlayout.h>
+#include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kseparator.h>
@@ -57,16 +58,17 @@
 	m_modellabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 
 	QGridLayout	*lay0 = new QGridLayout(this);
-  lay0->setMargin(0);
-  lay0->setSpacing(5);
+	lay0->setMargin(KDialog::marginHint());
+	lay0->setSpacing(KDialog::spacingHint());
+
 	QHBoxLayout	*lay1 = new QHBoxLayout();
-  lay1->setMargin(0);
-  lay1->setSpacing(10);
-	lay0->setRowStretch(7,0);
-	lay0->setRowStretch(10,1);
-	lay0->setColumnStretch(1,1);
-	lay0->addLayout(lay1, 0, 0, 0, 1);
-	lay0->addWidget(sep, 1, 1, 0, 1);
+	lay1->setMargin(0);
+	lay1->setSpacing(KDialog::spacingHint());
+	lay1->addWidget(m_titlepixmap, 0);
+	lay1->addWidget(m_title, 1);
+	lay0->addLayout(lay1, 0, 0, 1, 1);
+
+	lay0->addWidget(sep, 1, 0, 1, -1);
 	lay0->addWidget(m_typelabel, 2, 0);
 	lay0->addWidget(m_statelabel, 3, 0);
 	lay0->addWidget(m_loclabel, 4, 0);
@@ -81,8 +83,10 @@
 	lay0->addWidget(m_uri, 6, 1);
 	lay0->addWidget(m_device, 8, 1);
 	lay0->addWidget(m_model, 9, 1);
-	lay1->addWidget(m_title, 1);
-	lay1->addWidget(m_titlepixmap, 0);
+
+	lay0->setRowStretch(7,0);
+	lay0->setRowStretch(10,1);
+	lay0->setColumnStretch(1,1);
 }
 
 KMInfoPage::~KMInfoPage()
--- trunk/KDE/kdelibs/kdeprint/management/kmmainview.cpp #622245:622246
@@ -100,23 +100,23 @@
 	static_cast<KMenuBar*>( m_menubar )->setTopLevelMenu( false );
 	*/
 	m_menubar = new KToolBar( this, false, false );
-    m_menubar->setObjectName("MenuBar");
+	m_menubar->setObjectName("MenuBar");
 	m_menubar->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
 	m_menubar->setMovable( false );
 
 	// layout
-	QVBoxLayout	*m_layout = new QVBoxLayout(this);
-  m_layout->setMargin(0);
-  m_layout->setSpacing(0);
-	m_layout->addWidget(m_toolbar);
-	m_layout->addWidget( m_menubar );
+	QVBoxLayout *layout = new QVBoxLayout(this);
+	layout->setMargin(0);
+	layout->setSpacing(0);
+	layout->addWidget(m_toolbar);
+	layout->addWidget( m_menubar );
 	m_boxlayout = new QBoxLayout(QBoxLayout::TopToBottom);
-	m_layout->addLayout(m_boxlayout);
-  m_boxlayout->setSpacing(0);
+	layout->addLayout(m_boxlayout);
+	m_boxlayout->setSpacing(KDialog::spacingHint());
 	m_boxlayout->addWidget(m_printerview);
 	m_boxlayout->addWidget(m_printerpages);
-	m_layout->addSpacing(5);
-	m_layout->addWidget(m_plugin, 0);
+	layout->addSpacing(5);
+	layout->addWidget(m_plugin, 0);
 
 	// connections
 	connect(KMTimer::self(),SIGNAL(timeout()),SLOT(slotTimer()));
@@ -156,7 +156,7 @@
 	KConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
 	setViewType((KMPrinterView::ViewType)conf->readEntry("ViewType", \
                int(KMPrinterView::Icons)));
-	setOrientation(conf->readEntry("Orientation", int(Qt::Vertical)));
+	setOrientation(conf->readEntry("Orientation", 1));
 	bool 	view = conf->readEntry("ViewToolBar", false);
 	slotToggleToolBar(view);
 	((KToggleAction*)m_actions->action("view_toolbar"))->setChecked(view);
@@ -173,7 +173,7 @@
 	KConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
 	conf->writeEntry("ViewType",(int)m_printerview->viewType());
-	conf->writeEntry("Orientation",(int)orientation());
+	conf->writeEntry("Orientation",orientation() == Qt::Horizontal ? 1 : 0);
 	conf->writeEntry("ViewToolBar",((KToggleAction*)m_actions->action("view_toolbar"))->isChecked());
  conf->writeEntry("ViewMenuBar",static_cast<KToggleAction*>( \
m_actions->action("view_menubar") )->isChecked());  \
conf->writeEntry("ViewPrinterInfos",((KToggleAction*)m_actions->action("view_printerinfos"))->isChecked());



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