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

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror
From:       Wouter Becq <terwou () payperbyte ! be>
Date:       2008-12-08 10:01:36
Message-ID: 1228730496.776453.11103.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 894239 by terwou:

--qt3support


 M  +0 -1      settings/konqhtml/advancedTabOptions.ui  
 M  +0 -1      settings/konqhtml/css/cssconfig.ui  
 M  +0 -1      settings/konqhtml/css/csscustom.ui  
 M  +0 -1      settings/konqhtml/nsconfigwidget.ui  
 M  +0 -1      settings/performance/konqueror_ui.ui  
 M  +0 -1      settings/performance/system_ui.ui  
 M  +1 -1      src/konqcombo.cpp  
 M  +5 -5      src/konqtabs.cpp  


--- trunk/KDE/kdebase/apps/konqueror/settings/konqhtml/advancedTabOptions.ui #894238:894239
@@ -137,7 +137,6 @@
  </widget>
  <layoutdefault spacing="3" margin="6" />
  <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <resources/>
  <connections/>
 </ui>
--- trunk/KDE/kdebase/apps/konqueror/settings/konqhtml/css/cssconfig.ui #894238:894239
@@ -179,7 +179,6 @@
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
--- trunk/KDE/kdebase/apps/konqueror/settings/konqhtml/css/csscustom.ui #894238:894239
@@ -825,7 +825,6 @@
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
    <class>KColorButton</class>
--- trunk/KDE/kdebase/apps/konqueror/settings/konqhtml/nsconfigwidget.ui #894238:894239
@@ -149,7 +149,6 @@
  </widget>
  <layoutdefault spacing="17" margin="14" />
  <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
    <class>KListWidget</class>
--- trunk/KDE/kdebase/apps/konqueror/settings/performance/konqueror_ui.ui #894238:894239
@@ -124,5 +124,4 @@
     </layout>
   </widget>
   <layoutdefault spacing="3" margin="6" />
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
 </ui>
--- trunk/KDE/kdebase/apps/konqueror/settings/performance/system_ui.ui #894238:894239
@@ -47,7 +47,6 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <resources/>
  <connections/>
 </ui>
--- trunk/KDE/kdebase/apps/konqueror/src/konqcombo.cpp #894238:894239
@@ -120,7 +120,7 @@
 	    m_pageSecurity( KonqMainWindow::NotCrypted )
 {
     setLayoutDirection(Qt::LeftToRight);
-    setInsertPolicy( NoInsertion );
+    setInsertPolicy( NoInsert );
     setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ));
     setSizeAdjustPolicy( QComboBox::AdjustToMinimumContentsLength );
 
--- trunk/KDE/kdebase/apps/konqueror/src/konqtabs.cpp #894238:894239
@@ -166,7 +166,7 @@
     setCloseButtonEnabled( KonqSettings::hoverCloseButton() );
   setTabCloseActivatePrevious( KonqSettings::tabCloseActivatePrevious() );
   if (KonqSettings::tabPosition()=="Bottom")
-    setTabPosition(QTabWidget::Bottom);
+    setTabPosition( QTabWidget::South );
   connect( this, SIGNAL( closeRequest( QWidget * )), SLOT(slotCloseRequest( QWidget * )));
   connect( this, SIGNAL( removeTabPopup() ),
            m_pViewManager->mainWindow(), SLOT( slotRemoveTabPopup() ) );
@@ -602,7 +602,7 @@
 void KonqFrameTabs::slotCurrentChanged( int index )
 {
     const KColorScheme colorScheme(QPalette::Active, KColorScheme::Window);
-    setTabTextColor(index, colorScheme.foreground(KColorScheme::NormalText));
+    setTabTextColor(index, colorScheme.foreground(KColorScheme::NormalText).color());
 
     KonqFrameBase* currentFrame = dynamic_cast<KonqFrameBase*>(widget( index ));
     if (currentFrame && !m_pViewManager->isLoadingProfile()) {
@@ -648,14 +648,14 @@
     const KColorScheme colorScheme(QPalette::Active, KColorScheme::Window);
     QColor color;
     if (loading) {
-        color = colorScheme.foreground(KColorScheme::NeutralText); // a tab is currently loading
+        color = colorScheme.foreground(KColorScheme::NeutralText).color(); // a tab is currently loading
     } else {
         if (currentIndex() != pos) {
             // another tab has newly loaded contents. Use "link" because you can click on it to read it.
-            color = colorScheme.foreground(KColorScheme::LinkText);
+            color = colorScheme.foreground(KColorScheme::LinkText).color();
         } else {
             // the current tab has finished loading.
-            color = colorScheme.foreground(KColorScheme::NormalText);
+            color = colorScheme.foreground(KColorScheme::NormalText).color();
         }
     }
     setTabTextColor(pos, color);
[prev in list] [next in list] [prev in thread] [next in thread]