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

List:       kde-commits
Subject:    kdenox/konq-embed/src
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2006-07-19 14:26:10
Message-ID: 1153319170.716696.12265.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 564193 by eva:

added generic class PageDialog: 
- uses Scrollview with vertical scrollbar only and uses full width for
  viewport

reworked layout in cert dialogs


 M  +1 -1      Makefile.am  
 A             pagedialog.cpp   [License: GPL (v2+)]
 A             pagedialog.h   [License: GPL (v2+)]
 M  +19 -59    preferences_road.cc  
 M  +6 -2      preferences_road.h  


--- trunk/kdenox/konq-embed/src/Makefile.am #564192:564193
@@ -35,7 +35,7 @@
 		mainwindow_x11.cc mainwindow_kiosk.cc mainwindow_tv.cc mainwindow_road.cc \
xmltree.cc \  bookmarkeditor.cc bookmarkeditorimpl.cc bookmarkedit.cc \
bookmarkeditimpl.cc \  toggletoolbutton.cc roadmode.cc roadtabbar.cc websearcher.cc \
-		bookmarkeditorhierarchical.cc urlcombo.cpp 
+		bookmarkeditorhierarchical.cc urlcombo.cpp pagedialog.cpp
 
 konqueror_LDADD = $(LIB_ADDONS) \
 		$(top_builddir)/konq-embed/dropin/kio/libkiodropin.la \
--- trunk/kdenox/konq-embed/src/preferences_road.cc #564192:564193
@@ -1117,73 +1117,40 @@
 
 ///////////////////////////////////////////////////////////////////////////////////
 EditCertDialog::EditCertDialog( OtherCertItem *x, KSSLCertificate *cert, QWidget \
                *parent, const char * name ) :
-    QDialog( parent, name, true ),
+    PageDialog( parent, name, true ),
     certItem( x ), p_cert(cert)
 {
     KSSLX509Map certmap(cert->getSubject());
     setCaption( certmap.getValue("O") + tr("  SSL Certificate") );
 
-    QBoxLayout *mainlayout = new QHBoxLayout( this );
-    QScrollView *scrollView = new QScrollView( this );
-    QWidget *w = new QWidget( scrollView->viewport() );
-    scrollView->addChild( w );
-    scrollView->viewport()->setBackgroundMode(w->backgroundMode());
-    mainlayout->addWidget( scrollView );
-
     QVBoxLayout *vLayout = new QVBoxLayout( w, KDialog::marginHint(), 0 );
-    QGridLayout *layout = new QGridLayout(5, 2, KDialog::spacingHint());
-    vLayout->addItem(layout);
+//    QGridLayout *layout = new QGridLayout(5, 2, KDialog::spacingHint());
+//    vLayout->addItem(layout);
 
     QHBoxLayout *hlayout = new QHBoxLayout( 0 );
-    layout->addMultiCellLayout(hlayout, 0, 0, 0, 1);
+    //layout->addMultiCellLayout(hlayout, 0, 0, 0, 1);
+    vLayout->addLayout( hlayout );
 
+    oSubject = new KSSLCertBox( w );
+    oSubject->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, \
QSizePolicy::Preferred ) ); +    oSubject->setValues(certItem->getSub());
 
-    hlayout->addWidget(new QLabel(i18n("Chain:"), w));
-    hlayout->addSpacing( 6 );
-    _chain = new QComboBox(w);
-    _chain->setSizePolicy( QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed) \
                );
-    hlayout->addWidget( _chain);
-    hlayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, \
                QSizePolicy::Minimum));
-    connect(_chain, SIGNAL(activated(int)), this, SLOT(slotChain(int)));
+    vLayout->addWidget( new QLabel( tr( "Subject" ), w ) );
+    vLayout->addWidget(oSubject);
 
-    _chain->clear();
-
     if (cert->chain().isValid() && cert->chain().depth() > 1) {
-        _chain->setEnabled(true);
-        _chain->insertItem(i18n("0 - Site Certificate"));
         int cnt = 0;
         QPtrList<KSSLCertificate> cl = cert->chain().getChain();
         for (KSSLCertificate *c = cl.first(); c != 0; c = cl.next()) {
-            KSSLX509Map map(c->getSubject());
-            QString id;
-            id = map.getValue("CN");
-            if (id.length() == 0)
-                id = map.getValue("O");
-            if (id.length() == 0)
-                id = map.getValue("OU");
-            _chain->insertItem(QString::number(++cnt)+" - "+id);
+             oIssuer = new KSSLCertBox( w );
+             oIssuer->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, \
QSizePolicy::Preferred ) ); +             oIssuer->setValues(c->getIssuer());
+
+             vLayout->addWidget( new QLabel( tr( "Issuer xx" ), w ) );
+             vLayout->addWidget(oIssuer);
         }
-        _chain->setCurrentItem(0);
-    } else _chain->setEnabled(false);
+    }
 
-    oSubject = new KSSLCertBox( w );
-    oSubject->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, \
                QSizePolicy::Preferred ) );
-    oIssuer = new KSSLCertBox( w );
-    oIssuer->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, \
                QSizePolicy::Preferred ) );
-    oSubject->setValues(certItem->getSub());
-    oIssuer->setValues(cert->getIssuer());
-/*
-    vLayout->addWidget( new QLabel( tr( "Subject" ), w ) );
-    vLayout->addWidget(oSubject);
-    vLayout->addWidget( new QLabel( tr( "Issuer" ), w ) );
-    vLayout->addWidget(oIssuer);
-*/
-    layout->addWidget( new QLabel( tr( "Subject" ), w ), 2,0 );
-    layout->addWidget(oSubject, 3,0);
-    layout->addWidget( new QLabel( tr( "Issuer" ), w ), 2,1 );
-    layout->addWidget(oIssuer, 3,1);
-    layout->addItem(new QSpacerItem(0,4));
-
     QPalette pal;
     const QDateTime& curDate = QDateTime::currentDateTime();
     QGridLayout *grid = new QGridLayout( 0, 4, 3, 0, KDialog::spacingHint());
@@ -1251,7 +1218,6 @@
     vLayout->addWidget(new QLabel(i18n("MD5 digest:  ")+ cert->getMD5DigestText(), \
w));  //    QLabel* md5 = new QLabel( , w);
 //    md5Layout->addWidget( );
-
 //    vLayout->addLayout(md5Layout);
 }
 
@@ -1306,18 +1272,11 @@
 //////////////////////////////////////////////////////////////////////////////
 
 ViewCADialog::ViewCADialog(CAItem *x, QWidget *parent, const char * name) :
-    QDialog( parent, name, true )
+    PageDialog( parent, name, true )
 {
     if (!x) return;
     setCaption( x->getCommonName() );
 
-    QBoxLayout *layout = new QHBoxLayout( this );
-    QScrollView *scrollView = new QScrollView( this );
-    QWidget *w = new QWidget( scrollView->viewport() );
-    scrollView->addChild( w );
-    scrollView->viewport()->setBackgroundMode(w->backgroundMode());
-    layout->addWidget( scrollView );
-
     QVBoxLayout *toplayout = new QVBoxLayout( w, KDialog::marginHint(), 0 );
 
     toplayout->addWidget( new QLabel( i18n( "Subject" ), w )) ;
@@ -1344,5 +1303,6 @@
     toplayout->addWidget(new QLabel(i18n("MD5 digest: %1").arg(cHash), w) );
 }
 
+
 #include "preferences_road.moc"
 #endif // KONQ_GUI_ROAD
--- trunk/kdenox/konq-embed/src/preferences_road.h #564192:564193
@@ -25,6 +25,7 @@
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qlistview.h>
+#include "pagedialog.h"
 
 class QSpinBox;
 class QListView;
@@ -36,6 +37,7 @@
 class CAItem;
 class KSSLCertBox;
 class MainWindowBase;
+class QScrollView;
 
 class PreferencesRoad : public QDialog
 {
@@ -185,7 +187,7 @@
 };
 
 
-class EditCertDialog : public QDialog
+class EditCertDialog : public PageDialog
 {
     Q_OBJECT
 public:
@@ -209,10 +211,12 @@
     KSSLCertBox *oIssuer;
 };
 
-class ViewCADialog : public QDialog
+class ViewCADialog : public PageDialog
 {
+    Q_OBJECT
 public:
     ViewCADialog(CAItem *, QWidget *parent, const char * name=0);
 };
 
+
 #endif


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