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

List:       kde-commits
Subject:    KDE/kdepim
From:       Aurélien Gâteau <agateau () kde ! org>
Date:       2010-12-03 14:44:15
Message-ID: 20101203144415.3240FAC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1203297 by gateau:

No double margins

 M  +1 -0      calendarviews/eventviews/timeline/timelineview.cpp  
 M  +1 -0      korganizer/akonadicollectionview.cpp  
 M  +2 -1      korganizer/calendarview.cpp  
 M  +10 -13    korganizer/datenavigatorcontainer.cpp  
 M  +3 -6      korganizer/navigatorbar.cpp  
 M  +1 -0      korganizer/views/agendaview/koagendaview.cpp  
 M  +1 -0      korganizer/views/journalview/kojournalview.cpp  
 M  +1 -0      korganizer/views/monthview/monthview.cpp  
 M  +1 -0      korganizer/views/timelineview/kotimelineview.cpp  
 M  +1 -0      korganizer/views/todoview/kotodoview.cpp  


--- trunk/KDE/kdepim/calendarviews/eventviews/timeline/timelineview.cpp #1203296:1203297
@@ -172,6 +172,7 @@
   : EventView( parent ), d( new Private( this ) )
 {
   QVBoxLayout *vbox = new QVBoxLayout( this );
+  vbox->setMargin( 0 );
   QSplitter *splitter = new QSplitter( Qt::Horizontal, this );
   d->mLeftView = new QTreeWidget;
   d->mLeftView->setHeader( new GanttHeaderView );
--- trunk/KDE/kdepim/korganizer/akonadicollectionview.cpp #1203296:1203297
@@ -158,6 +158,7 @@
     mHasContextMenu( hasContextMenu )
 {
   QVBoxLayout *topLayout = new QVBoxLayout( this );
+  topLayout->setMargin( 0 );
   topLayout->setSpacing( KDialog::spacingHint() );
 
   KLineEdit *searchCol = new KLineEdit( this );
--- trunk/KDE/kdepim/korganizer/calendarview.cpp #1203296:1203297
@@ -146,11 +146,12 @@
   mTodoList->setObjectName( "todolist" );
 
   mEventViewerBox = new KVBox( mLeftSplitter );
-  mEventViewerBox->setMargin( KDialog::marginHint() );
+  mEventViewerBox->setMargin( 0 );
   mEventViewer = new CalendarSupport::IncidenceViewer( mEventViewerBox );
   mEventViewer->setObjectName( "EventViewer" );
 
   KVBox *rightBox = new KVBox( mPanner );
+  rightBox->layout()->setMargin( 0 );
   mNavigatorBar = new NavigatorBar( rightBox );
   mRightFrame = new QStackedWidget( rightBox );
   rightBox->setStretchFactor( mRightFrame, 1 );
--- trunk/KDE/kdepim/korganizer/datenavigatorcontainer.cpp #1203296:1203297
@@ -243,9 +243,8 @@
 
 //  kDebug() << "  NAVIGATORVIEW minimumSizeHint:" << minSize;
 
-  int margin = KDialog::spacingHint();
-  int verticalCount = ( size().height() - margin * 2 ) / minSize.height();
-  int horizontalCount = ( size().width() - margin * 2 ) / minSize.width();
+  int verticalCount = size().height() / minSize.height();
+  int horizontalCount = size().width() / minSize.width();
 
   if ( horizontalCount != mHorizontalCount || verticalCount != mVerticalCount ) {
     int count = horizontalCount * verticalCount;
@@ -276,8 +275,8 @@
     }
   }
 
-  int height = ( size().height() - margin * 2 ) / verticalCount;
-  int width = ( size().width() - margin * 2 ) / horizontalCount;
+  int height = size().height() / verticalCount;
+  int width = size().width() / horizontalCount;
 
   NavigatorBar *bar = mNavigatorView->navigatorBar();
   if ( horizontalCount > 1 ) {
@@ -287,8 +286,8 @@
   }
 
   mNavigatorView->setGeometry( ( ( ( KOGlobals::self()->reverseLayout() ) ?
-                                   ( horizontalCount - 1 ) : 0 ) * width ) + margin,
-                               margin, width, height );
+                                   ( horizontalCount - 1 ) : 0 ) * width ),
+                               0, width, height );
   for ( int i = 0; i < mExtraViews.count(); ++i ) {
     int x = ( i + 1 ) % horizontalCount;
     int y = ( i + 1 ) / horizontalCount;
@@ -305,22 +304,20 @@
       }
     }
     view->setGeometry( ( ( ( KOGlobals::self()->reverseLayout() ) ?
-                           ( horizontalCount - 1 - x ) : x ) * width ) + margin,
-                       ( y * height ) + margin, width, height );
+                           ( horizontalCount - 1 - x ) : x ) * width ),
+                       y * height, width, height );
 
   }
 }
 
 QSize DateNavigatorContainer::minimumSizeHint() const
 {
-  int margin = KDialog::spacingHint() * 2;
-  return mNavigatorView->minimumSizeHint() + QSize( margin, margin );
+  return mNavigatorView->minimumSizeHint();
 }
 
 QSize DateNavigatorContainer::sizeHint() const
 {
-  int margin = KDialog::spacingHint() * 2;
-  return mNavigatorView->sizeHint() + QSize( margin, margin );
+  return mNavigatorView->sizeHint();
 }
 
 void DateNavigatorContainer::setHighlightMode( bool highlightEvents,
--- trunk/KDE/kdepim/korganizer/navigatorbar.cpp #1203296:1203297
@@ -42,10 +42,6 @@
 
   bool isRTL = KOGlobals::self()->reverseLayout();
 
-  // Create a horizontal spacers
-  QSpacerItem *frontSpacer = new QSpacerItem( 50, 1, QSizePolicy::Expanding );
-  QSpacerItem *endSpacer = new QSpacerItem( 50, 1, QSizePolicy::Expanding );
-
   mPrevYear = createNavigationButton(
     isRTL ? "arrow-right-double" : "arrow-left-double",
     i18n( "Scroll backward to the previous year" ),
@@ -86,12 +82,13 @@
 
   // set up control frame layout
   QHBoxLayout *ctrlLayout = new QHBoxLayout( this );
+  ctrlLayout->setMargin( 0 );
   ctrlLayout->addWidget( mPrevYear );
   ctrlLayout->addWidget( mPrevMonth );
-  ctrlLayout->addSpacerItem( frontSpacer );
+  ctrlLayout->addStretch();
   ctrlLayout->addWidget( mMonth );
   ctrlLayout->addWidget( mYear );
-  ctrlLayout->addSpacerItem( endSpacer );
+  ctrlLayout->addStretch();
   ctrlLayout->addWidget( mNextMonth );
   ctrlLayout->addWidget( mNextYear );
 
--- trunk/KDE/kdepim/korganizer/views/agendaview/koagendaview.cpp #1203296:1203297
@@ -62,6 +62,7 @@
   KOEventView( parent ), d( new Private( isSideBySide, this ) )
 {
   QHBoxLayout *layout = new QHBoxLayout( this );
+  layout->setMargin( 0 );
   layout->addWidget( d->mAgendaView );
 
   connect( d->mAgendaView, SIGNAL(zoomViewHorizontally(QDate,int)),
--- trunk/KDE/kdepim/korganizer/views/journalview/kojournalview.cpp #1203296:1203297
@@ -48,6 +48,7 @@
   : KOrg::BaseView( parent )
 {
   QVBoxLayout *topLayout = new QVBoxLayout( this );
+  topLayout->setMargin( 0 );
   mSA = new QScrollArea( this );
   mVBox = new KVBox( mSA->viewport() );
   mSA->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
--- trunk/KDE/kdepim/korganizer/views/monthview/monthview.cpp #1203296:1203297
@@ -38,6 +38,7 @@
     Private( MonthView *qq ) : q( qq )
     {
       QVBoxLayout *layout = new QVBoxLayout( q );
+      layout->setMargin( 0 );
       mMonthView = new EventViews::MonthView( EventViews::MonthView::Visible, q );
       mMonthView->setPreferences( KOPrefs::instance()->eventViewsPreferences() );
       layout->addWidget( mMonthView );
--- trunk/KDE/kdepim/korganizer/views/timelineview/kotimelineview.cpp #1203296:1203297
@@ -38,6 +38,7 @@
     Private( KOTimelineView *q ) : mEventPopup( 0 ), mParent( q )
     {
       QVBoxLayout *vbox = new QVBoxLayout( mParent );
+      vbox->setMargin( 0 );
       mTimeLineView = new EventViews::TimelineView( mParent );
       vbox->addWidget( mTimeLineView );
       mEventPopup = q->eventPopup();
--- trunk/KDE/kdepim/korganizer/views/todoview/kotodoview.cpp #1203296:1203297
@@ -139,6 +139,7 @@
            this, SLOT(setFlatView(bool)) );
 
   QGridLayout *layout = new QGridLayout( this );
+  layout->setMargin( 0 );
   layout->addWidget( mQuickSearch, 0, 0, 1, 2 );
   layout->addWidget( mView, 1, 0, 1, 2 );
   layout->setRowStretch( 1, 1 );
[prev in list] [next in list] [prev in thread] [next in thread]