From 3fa56470a5475a114d5a2f8bcdc7047a6138662e Mon Sep 17 00:00:00 2001
From: asl <asl@opencascade.com>
Date: Wed, 20 Jul 2005 11:28:10 +0000
Subject: [PATCH] debug

---
 src/Qtx/QtxListResourceEdit.cxx | 10 ++++++++--
 src/Qtx/QtxResourceMgr.cxx      | 11 ++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Qtx/QtxListResourceEdit.cxx b/src/Qtx/QtxListResourceEdit.cxx
index bb6bfccaf..de13a8e59 100644
--- a/src/Qtx/QtxListResourceEdit.cxx
+++ b/src/Qtx/QtxListResourceEdit.cxx
@@ -16,7 +16,7 @@
 #include <qobjectlist.h>
 #include <qcolordialog.h>
 #include <qwidgetstack.h>
-#include <qpushbutton.h>
+#include <qtoolbutton.h>
 #include <qfontdialog.h>
 
 #include "QtxIntSpinBox.h"
@@ -819,7 +819,13 @@ QtxListResourceEdit::FontItem::FontItem( const QString& title, QtxResourceEdit*
 {
   new QLabel( title, this );
   myFontPrs = new QLabel( "", this );
-  QPushButton* selFont = new QPushButton( "..", this );
+  myFontPrs->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+  myFontPrs->setAutoResize( true );
+  myFontPrs->setAlignment( Qt::AlignLeft );
+  
+  QToolButton* selFont = new QToolButton( this );
+  selFont->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) );
+  selFont->setText( "..." );
   connect( selFont, SIGNAL( clicked() ), this, SLOT( onSelectFont() ) );
 }
 
diff --git a/src/Qtx/QtxResourceMgr.cxx b/src/Qtx/QtxResourceMgr.cxx
index 917037bb4..e23905a24 100644
--- a/src/Qtx/QtxResourceMgr.cxx
+++ b/src/Qtx/QtxResourceMgr.cxx
@@ -758,8 +758,8 @@ bool QtxResourceMgr::value( const QString& sect, const QString& name, QColor& cV
 
 bool QtxResourceMgr::value( const QString& sect, const QString& name, QFont& fVal ) const
 {
-  QString val = stringValue( sect, name, "" ).stripWhiteSpace();
-  QStringList font_values = QStringList::split( val, "," );
+  QString val = stringValue( sect, name, "" );
+  QStringList font_values = QStringList::split( ",", val );
   if( font_values.count()<2 || font_values.count()>4 )
     return false;
   
@@ -768,13 +768,14 @@ bool QtxResourceMgr::value( const QString& sect, const QString& name, QFont& fVa
   int pSize = -1;
   for( int i=1, n=font_values.count(); i<n; i++ )
   {
-    if( !isBold && font_values[i].lower()=="bold" )
+    QString curval = font_values[i].stripWhiteSpace().lower();
+    if( !isBold && curval=="bold" )
       isBold = true;
-    else if( !isItalic && font_values[i].lower()=="italic" )
+    else if( !isItalic && curval=="italic" )
       isItalic = true;
     else if( pSize<0 )
     {
-      pSize = font_values[i].toInt( &isOk );
+      pSize = curval.toInt( &isOk );
       if( !isOk )
         pSize = -1;
     }
-- 
2.39.2