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

List:       kde-core-devel
Subject:    [PATCH] kdebase/kplashml/kcmsplash
From:       Benoit Walter <b.walter () free ! fr>
Date:       2004-01-09 14:00:07
Message-ID: 200401091500.08095.b.walter () free ! fr
[Download RAW message or body]

This small patch slightly changes the layout to make the dialog fit better on 
small displays.

Any objection?

["kcmsplashml.diff" (text/x-diff)]

Index: installer.cpp
===================================================================
RCS file: /home/kde/kdebase/ksplashml/kcmksplash/installer.cpp,v
retrieving revision 1.10
diff -u -3 -p -r1.10 installer.cpp
--- installer.cpp	8 Dec 2003 22:29:45 -0000	1.10
+++ installer.cpp	9 Jan 2004 13:59:23 -0000
@@ -16,16 +16,15 @@
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qtextedit.h>
-#include <qpushbutton.h>
 
 #include "installer.h"
 
-#include <kbuttonbox.h>
 #include <kdebug.h>
 #include <kfiledialog.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kmessagebox.h>
+#include <kpushbutton.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
@@ -90,41 +89,41 @@ SplashInstaller::SplashInstaller (QWidge
   : QWidget(aParent, aName), mGui(!aInit)
 {
   KGlobal::dirs()->addResourceType("ksplashthemes", \
                KStandardDirs::kde_default("data") + "ksplash/Themes");
-  KButtonBox* bbox;
 
   if (!mGui)
     return;
 
-  QGridLayout *grid = new QGridLayout(this, 2, 3, 0, KDialog::spacingHint());
+  QGridLayout *grid = new QGridLayout(this, 3, 2, 0, KDialog::spacingHint());
   mThemesList = new ThemeListBox(this);
   connect(mThemesList, SIGNAL(highlighted(int)), SLOT(slotSetTheme(int)));
   connect(mThemesList, SIGNAL(filesDropped(const KURL::List&)), \
                SLOT(slotFilesDropped(const KURL::List&)));
-  grid->addMultiCellWidget(mThemesList, 0, 1, 0, 0);
+  grid->addWidget(mThemesList, 0, 0);
 
   mPreview = new QLabel(this);
   mPreview->setFrameStyle(QFrame::Panel|QFrame::Sunken);
   mPreview->setMinimumSize(QSize(320,240));
   mPreview->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
-  grid->addWidget(mPreview, 0, 1);
+  grid->addMultiCellWidget(mPreview, 0, 1, 1, 1);
 
-  bbox = new KButtonBox(this, KButtonBox::Vertical, 0, 6);
-  grid->addMultiCellWidget(bbox, 0, 1, 2, 2);
+  QVBoxLayout* btnLayout = new QVBoxLayout( this, 0, KDialog::spacingHint() );
+  grid->addLayout( btnLayout, 1, 0 );
 
-  mBtnAdd = bbox->addButton(i18n("Add..."));
+  mBtnAdd = new KPushButton( i18n("Add..."), this );
+  btnLayout->addWidget( mBtnAdd );
   connect(mBtnAdd, SIGNAL(clicked()), SLOT(slotAdd()));
 
-  mBtnRemove = bbox->addButton(i18n("Remove"));
+  mBtnRemove = new KPushButton( i18n("Remove"), this );
+  btnLayout->addWidget( mBtnRemove );
   connect(mBtnRemove, SIGNAL(clicked()), SLOT(slotRemove()));
 
-  mBtnTest = bbox->addButton(i18n("Test"));
+  mBtnTest = new KPushButton( i18n("Test"), this );
+  btnLayout->addWidget( mBtnTest );
   connect(mBtnTest, SIGNAL(clicked()), SLOT(slotTest()));
 
-  bbox->layout();
-
   mText = new QTextEdit(this);
   mText->setMinimumSize(mText->sizeHint());
   mText->setReadOnly(true);
-  grid->addWidget(mText, 1, 1);
+  grid->addMultiCellWidget(mText, 2, 2, 0, 1);
 
   grid->setColStretch(0, 1);
   grid->setColStretch(1, 3);



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