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

List:       kde-commits
Subject:    KDE/kdelibs/kio
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2006-02-28 21:11:26
Message-ID: 1141161086.484103.12996.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 514622 by chehrlic:

qt3support--
QLabel

 M  +9 -2      bookmarks/kbookmarkmenu.cc  
 M  +3 -2      kfile/kmetaprops.cpp  
 M  +11 -6     kfile/kpropertiesdialog.cpp  


--- trunk/KDE/kdelibs/kio/bookmarks/kbookmarkmenu.cc #514621:514622
@@ -785,19 +785,26 @@
 
 KBookmarkEditFields::KBookmarkEditFields(QWidget *main, QBoxLayout *vbox, FieldsSet \
fieldsSet)  {
+  QLabel *tmpLabel;
   bool isF = (fieldsSet != FolderFieldsSet);
 
   QGridLayout *grid = new QGridLayout( vbox, 2, isF ? 2 : 1 );
 
   m_title = new KLineEdit( main );
+  tmpLabel = new QLabel( main );
+  tmpLabel->setText( i18n( "Name:" ) );
+  tmpLabel->setBuddy( m_title );
   grid->addWidget( m_title, 0, 1 );
-  grid->addWidget( new QLabel( m_title, i18n( "Name:" ), main ), 0, 0 );
+  grid->addWidget( tmpLabel, 0, 0 );
   m_title->setFocus();
   if (isF)
   {
     m_url = new KLineEdit( main );
+    tmpLabel = new QLabel( main );
+    tmpLabel->setText( i18n( "Location:" ) );
+    tmpLabel->setBuddy( m_url );
     grid->addWidget( m_url, 1, 1 );
-    grid->addWidget( new QLabel( m_url, i18n( "Location:" ), main ), 1, 0 );
+    grid->addWidget( tmpLabel, 1, 0 );
   }
   else
   {
--- trunk/KDE/kdelibs/kio/kfile/kmetaprops.cpp #514621:514622
@@ -180,7 +180,8 @@
                 iit!=editItems.end(); ++iit)
         {
             QLabel* l = new QLabel((*iit).translatedKey() + ":", groupBox);
-            l->setAlignment( Qt::AlignAuto | Qt::AlignTop | Qt::ExpandTabs );
+			// FIXME: imho Qt::TextExpandTabs is ignored - how to set this?
+            l->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::TextExpandTabs );
             QValidator* val = mtinfo->createValidator(*git, (*iit).key());
             if (!val) kDebug(7033) << "didn't get a validator for " << *git << "/" \
<< (*iit).key() << endl;  w = new KFileMetaInfoWidget(*iit, val, groupBox);
@@ -193,7 +194,7 @@
                 iit!=readItems.end(); ++iit)
         {
             QLabel* l = new QLabel((*iit).translatedKey() + ":", groupBox);
-            l->setAlignment( Qt::AlignAuto | Qt::AlignTop | Qt::ExpandTabs );
+            l->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::TextExpandTabs );
             (new KFileMetaInfoWidget(*iit, KFileMetaInfoWidget::ReadOnly, 0L, \
groupBox));  }
     }
--- trunk/KDE/kdelibs/kio/kfile/kpropertiesdialog.cpp #514621:514622
@@ -1750,7 +1750,7 @@
     QString name = QString::fromLatin1(ge->gr_name);
     if (name.isEmpty())
       name.setNum(ge->gr_gid);
-    if (groupList.find(name) == groupList.end())
+    if (groupList.indexOf(name) == -1)
       groupList += name;
   }
 
@@ -2505,7 +2505,8 @@
   QVBoxLayout *layout = new QVBoxLayout(d->m_frame, 0, KDialog::spacingHint());
 
   QLabel *l;
-  l = new QLabel( d->m_frame, "Label_1" );
+  l = new QLabel( d->m_frame );
+  l->setObjectName( QLatin1String( "Label_1" ) );
   l->setText( i18n("URL:") );
   layout->addWidget(l);
 
@@ -2613,7 +2614,8 @@
   QBoxLayout *mainlayout = new QVBoxLayout(d->m_frame, 0, KDialog::spacingHint());
   QLabel* tmpQLabel;
 
-  tmpQLabel = new QLabel( d->m_frame, "Label_1" );
+  tmpQLabel = new QLabel( d->m_frame );
+  tmpQLabel->setObjectName( QLatin1String( "Label_1" ) );
   tmpQLabel->setText(  i18n("Pattern ( example: *.html;*.htm )") );
   tmpQLabel->setMinimumSize(tmpQLabel->sizeHint());
   mainlayout->addWidget(tmpQLabel, 1);
@@ -2625,7 +2627,8 @@
   patternEdit->setFixedHeight( fontHeight );
   mainlayout->addWidget(patternEdit, 1);
 
-  tmpQLabel = new QLabel( d->m_frame, "Label_2" );
+  tmpQLabel = new QLabel( d->m_frame );
+  tmpQLabel->setObjectName( QLatin1String( "Label_2" ) );
   tmpQLabel->setText(  i18n("Mime Type") );
   tmpQLabel->setMinimumSize(tmpQLabel->sizeHint());
   mainlayout->addWidget(tmpQLabel, 1);
@@ -2636,7 +2639,8 @@
   mimeEdit->setFixedHeight( fontHeight );
   mainlayout->addWidget(mimeEdit, 1);
 
-  tmpQLabel = new QLabel( d->m_frame, "Label_3" );
+  tmpQLabel = new QLabel( d->m_frame );
+  tmpQLabel->setObjectName( QLatin1String( "Label_3" ) );
   tmpQLabel->setText(  i18n("Comment") );
   tmpQLabel->setMinimumSize(tmpQLabel->sizeHint());
   mainlayout->addWidget(tmpQLabel, 1);
@@ -2826,7 +2830,8 @@
                       i18n("Mount point:")); // new style (combobox)
   layout->addWidget(label, 3, 0);
 
-  mountpoint = new QLabel( d->m_frame, "LineEdit_mountpoint" );
+  mountpoint = new QLabel( d->m_frame );
+  mountpoint->setObjectName( QLatin1String( "LineEdit_mountpoint" ) );
 
   layout->addWidget(mountpoint, 3, 1);
 


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