rpms/kdesdk/devel kdesdk-3.96.2-fix-kompare.patch, 1.1, 1.2 kdesdk.spec, 1.78, 1.79
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Mon Dec 10 11:59:13 UTC 2007
Author: kkofler
Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25033/devel
Modified Files:
kdesdk-3.96.2-fix-kompare.patch kdesdk.spec
Log Message:
* Mon Dec 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-2
- updated fix-kompare patch (rev 5)
kdesdk-3.96.2-fix-kompare.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 kdesdk-3.96.2-fix-kompare.patch
Index: kdesdk-3.96.2-fix-kompare.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk-3.96.2-fix-kompare.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdesdk-3.96.2-fix-kompare.patch 6 Dec 2007 03:48:13 -0000 1.1
+++ kdesdk-3.96.2-fix-kompare.patch 10 Dec 2007 11:59:03 -0000 1.2
@@ -95,14 +95,8 @@
diff -Nur kdesdk-3.96.2-orig/kompare/komparepart/CMakeLists.txt kdesdk-3.96.2-fix-kompare/kompare/komparepart/CMakeLists.txt
--- kdesdk-3.96.2-orig/kompare/komparepart/CMakeLists.txt 2007-07-26 12:38:11.000000000 +0200
-+++ kdesdk-3.96.2-fix-kompare/kompare/komparepart/CMakeLists.txt 2007-12-05 00:45:07.000000000 +0100
-@@ -5,11 +5,13 @@
- ########### next target ###############
-
- set(komparepart_PART_SRCS
-+ kompare_qsplitter.cpp
- kompare_part.cpp
- kompareconnectwidget.cpp
++++ kdesdk-3.96.2-fix-kompare/kompare/komparepart/CMakeLists.txt 2007-12-10 11:01:58.000000000 +0100
+@@ -10,6 +10,7 @@
komparesplitter.cpp
komparelistview.cpp
kompareprefdlg.cpp
@@ -110,7 +104,7 @@
komparesaveoptionswidget.cpp )
-@@ -19,7 +21,7 @@
+@@ -19,7 +20,7 @@
@@ -121,7 +115,7 @@
diff -Nur kdesdk-3.96.2-orig/kompare/komparepart/kompareconnectwidget.cpp kdesdk-3.96.2-fix-kompare/kompare/komparepart/kompareconnectwidget.cpp
--- kdesdk-3.96.2-orig/kompare/komparepart/kompareconnectwidget.cpp 2006-10-26 04:18:11.000000000 +0200
-+++ kdesdk-3.96.2-fix-kompare/kompare/komparepart/kompareconnectwidget.cpp 2007-12-05 02:48:41.000000000 +0100
++++ kdesdk-3.96.2-fix-kompare/kompare/komparepart/kompareconnectwidget.cpp 2007-12-10 12:27:29.000000000 +0100
@@ -20,10 +20,15 @@
***************************************************************************/
@@ -139,13 +133,20 @@
#include <kdebug.h>
-@@ -41,18 +46,19 @@
- ViewSettings* settings,
+@@ -36,23 +41,22 @@
+
+ using namespace Diff2;
+
+-KompareConnectWidgetFrame::KompareConnectWidgetFrame( KompareListView* left,
+- KompareListView* right,
+- ViewSettings* settings,
++KompareConnectWidgetFrame::KompareConnectWidgetFrame( ViewSettings* settings,
KompareSplitter* parent,
const char* name ) :
- QSplitterHandle(Horizontal, (QSplitter *)parent, name),
-+ KompareQSplitterHandle(Qt::Horizontal, (KompareQSplitter *)parent),
- m_wid ( left, right, settings, this, name ),
+- m_wid ( left, right, settings, this, name ),
++ QSplitterHandle(Qt::Horizontal, (QSplitter *)parent),
++ m_wid ( settings, this, name ),
m_label ( "", this ),
m_layout ( this )
{
@@ -163,7 +164,7 @@
bottomLine->setSizePolicy ( QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed) );
bottomLine->setFixedHeight(1);
m_layout.setSpacing(0);
-@@ -68,14 +74,15 @@
+@@ -68,14 +72,16 @@
QSize KompareConnectWidgetFrame::sizeHint() const
{
@@ -173,6 +174,7 @@
static int kMouseOffset;
++#if 0
void KompareConnectWidgetFrame::mouseMoveEvent( QMouseEvent *e )
{
- if ( !(e->state()&LeftButton) )
@@ -181,15 +183,14 @@
return;
QCOORD pos = s->pick( parentWidget()->mapFromGlobal(e->globalPos()) )
-@@ -86,14 +93,14 @@
+@@ -86,31 +92,29 @@
void KompareConnectWidgetFrame::mousePressEvent( QMouseEvent *e )
{
- if ( e->button() == LeftButton )
+ if ( e->button() == Qt::LeftButton )
kMouseOffset = s->pick( e->pos() );
-- QSplitterHandle::mousePressEvent(e);
-+ KompareQSplitterHandle::mousePressEvent(e);
+ QSplitterHandle::mousePressEvent(e);
}
void KompareConnectWidgetFrame::mouseReleaseEvent( QMouseEvent *e )
@@ -199,7 +200,18 @@
QCOORD pos = s->pick( parentWidget()->mapFromGlobal(e->globalPos()) )
- kMouseOffset;
((KompareSplitter*)s)->moveSplitter( pos, id() );
-@@ -110,7 +117,7 @@
+ }
+ }
++#endif
+
+-KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListView* right,
+- ViewSettings* settings, QWidget* parent, const char* name )
++KompareConnectWidget::KompareConnectWidget( ViewSettings* settings, QWidget* parent, const char* name )
+ : QWidget(parent, name),
+ m_settings( settings ),
+- m_leftView( left ),
+- m_rightView( right ),
+ m_selectedModel( 0 ),
m_selectedDifference( 0 )
{
// connect( m_settings, SIGNAL( settingsChanged() ), this, SLOT( slotDelayedRepaint() ) );
@@ -208,7 +220,7 @@
setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum ) );
setFocusProxy( parent->parentWidget() );
}
-@@ -157,10 +164,10 @@
+@@ -157,17 +161,22 @@
// kDebug(8106) << "KompareConnectWidget::paintEvent()" << endl;
QPixmap pixbuf(size());
@@ -216,13 +228,30 @@
- QPainter* p = &paint;
+ Q3Painter paint(&pixbuf);
+ Q3Painter* p = &paint;
++
++ p->fillRect( 0, 0, pixbuf.width(), pixbuf.height(), QColor(Qt::white).dark(110) );
- p->fillRect( 0, 0, pixbuf.width(), pixbuf.height(), white.dark(110) );
-+ p->fillRect( 0, 0, pixbuf.width(), pixbuf.height(), QColor(Qt::white).dark(110) );
++ KompareSplitter* splitter = static_cast<KompareSplitter*>( parent()->parent() );
++ int count = splitter->count();
++ KompareListView *leftView = count >= 2 ? static_cast<KompareListViewFrame*>( splitter->widget(0) )->view() : 0;
++ KompareListView *rightView = count >= 2 ? static_cast<KompareListViewFrame*>( splitter->widget(1) )->view() : 0;
- if ( m_selectedModel )
+- if ( m_selectedModel )
++ if ( m_selectedModel && leftView && rightView )
{
-@@ -179,7 +186,7 @@
+- int firstL = m_leftView->firstVisibleDifference();
+- int firstR = m_rightView->firstVisibleDifference();
+- int lastL = m_leftView->lastVisibleDifference();
+- int lastR = m_rightView->lastVisibleDifference();
++ int firstL = leftView->firstVisibleDifference();
++ int firstR = rightView->firstVisibleDifference();
++ int lastL = leftView->lastVisibleDifference();
++ int lastR = rightView->lastVisibleDifference();
+
+ int first = firstL < 0 ? firstR : qMin( firstL, firstR );
+ int last = lastL < 0 ? lastR : qMax( lastL, lastR );
+@@ -179,7 +188,7 @@
{
const DifferenceList* differences = const_cast<DiffModel*>(m_selectedModel)->differences();
DifferenceListConstIterator diffIt = differences->at( first );
@@ -231,7 +260,25 @@
QRect leftRect, rightRect;
-@@ -211,8 +218,8 @@
+@@ -190,13 +199,13 @@
+
+ if ( QApplication::reverseLayout() )
+ {
+- leftRect = m_rightView->itemRect( i );
+- rightRect = m_leftView->itemRect( i );
++ leftRect = rightView->itemRect( i );
++ rightRect = leftView->itemRect( i );
+ }
+ else
+ {
+- leftRect = m_leftView->itemRect( i );
+- rightRect = m_rightView->itemRect( i );
++ leftRect = leftView->itemRect( i );
++ rightRect = rightView->itemRect( i );
+ }
+
+ int tl = leftRect.top();
+@@ -211,8 +220,8 @@
br = br <= 32767 ? br : 32767;
// kDebug(8106) << "drawing: " << tl << " " << tr << " " << bl << " " << br << endl;
@@ -242,7 +289,7 @@
QColor color = m_settings->colorForDifferenceType( diff->type(), selected, diff->applied() ).dark(110);
p->setPen( color );
-@@ -229,16 +236,16 @@
+@@ -229,16 +238,16 @@
}
[...3191 lines suppressed...]
-+Q_GUI_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align = 0);
-+
-+int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm);
-+
-+/*
-+ Modify total maximum (max), total expansion (exp), and total empty
-+ when adding boxmax/boxexp.
+ void scrollViewsToId( int id );
+ void setXOffset( int x );
+
++ void selectionChanged( const Diff2::Difference* diff );
+
-+ Expansive boxes win over non-expansive boxes.
-+ Non-empty boxes win over empty boxes.
-+*/
-+static inline void qMaxExpCalc(int & max, bool &exp, bool &empty,
-+ int boxmax, bool boxexp, bool boxempty)
-+{
-+ if (exp) {
-+ if (boxexp)
-+ max = qMax(max, boxmax);
-+ } else {
-+ if (boxexp || empty && (!boxempty || max == 0))
-+ max = boxmax;
-+ else if (empty == boxempty)
-+ max = qMin(max, boxmax);
-+ }
-+ exp = exp || boxexp;
-+ empty = empty && boxempty;
-+}
+ public slots:
++ void slotScrollToId( int id );
++ void slotDelayedUpdateScrollBars();
++ void slotUpdateScrollBars();
++ void slotDelayedUpdateVScrollValue();
++ void slotUpdateVScrollValue();
++ void slotScroll( QWheelEvent* e );
++ void keyPressEvent( QKeyEvent* e );
++
+ void slotApplyDifference( bool apply );
+ void slotApplyAllDifferences( bool apply );
+ void slotApplyDifference( const Diff2::Difference* diff, bool apply );
+
+- // to update the list views
+ void slotSetSelection( const Diff2::DiffModel* model, const Diff2::Difference* diff );
+ void slotSetSelection( const Diff2::Difference* diff );
+
+@@ -64,35 +73,28 @@
+
+ void slotConfigChanged();
+
+- void scrollToId( int id );
+- void slotDelayedUpdateScrollBars();
+- void slotUpdateScrollBars();
+- void slotDelayedUpdateVScrollValue();
+- void slotUpdateVScrollValue();
+-
+ protected:
+- void childEvent( QChildEvent * );
+- void wheelEvent( QWheelEvent* e );
+- void keyPressEvent( QKeyEvent* e );
+-
+ void moveSplitter( QCOORD pos, int id );
+
+-private slots:
++ ViewSettings* settings() const { return m_settings; }
+
-+#endif // QLAYOUTENGINE_P_H
++protected slots:
+ void slotDelayedRepaintHandles();
++ void slotRepaintHandles();
+ void timerTimeout();
+
+ private:
+- QSplitterLayoutStruct *addWidget(KompareListViewFrame *w,
+- bool prepend = FALSE );
++ // override from QSplitter
++ QSplitterHandle* createHandle();
+
+- void doMove( bool backwards, int pos, int id, int delta,
+- bool mayCollapse, int* positions, int* widths );
++ void setCursor( int id, const QCursor& cursor );
++ void unsetCursor( int id );
+
+- void repaintHandles();
++protected:
++ KompareListView* listView( int index );
++ KompareConnectWidget* connectWidget( int index );
+
+- QTimer* m_scrollTimer;
+- bool restartTimer;
+- int scrollTo;
++private:
+
+ // Scrollbars. all this just for the goddamn scrollbars. i hate them.
+ int scrollId();
+@@ -106,6 +108,10 @@
+ int maxContentsX();
+ int minVisibleWidth();
+
++ QTimer* m_scrollTimer;
++ bool m_restartTimer;
++ int m_scrollTo;
++
+ ViewSettings* m_settings;
+ QScrollBar* m_vScroll;
+ QScrollBar* m_hScroll;
diff -Nur kdesdk-3.96.2-orig/kompare/kompare_shell.cpp kdesdk-3.96.2-fix-kompare/kompare/kompare_shell.cpp
--- kdesdk-3.96.2-orig/kompare/kompare_shell.cpp 2007-10-03 13:46:58.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/kompare_shell.cpp 2007-12-05 08:06:28.000000000 +0100
@@ -4350,17 +3525,27 @@
#include "diffsettings.moc"
diff -Nur kdesdk-3.96.2-orig/kompare/libdialogpages/filespage.cpp kdesdk-3.96.2-fix-kompare/kompare/libdialogpages/filespage.cpp
--- kdesdk-3.96.2-orig/kompare/libdialogpages/filespage.cpp 2006-10-26 04:18:11.000000000 +0200
-+++ kdesdk-3.96.2-fix-kompare/kompare/libdialogpages/filespage.cpp 2007-12-06 02:52:26.000000000 +0100
++++ kdesdk-3.96.2-fix-kompare/kompare/libdialogpages/filespage.cpp 2007-12-10 12:32:42.000000000 +0100
@@ -32,7 +32,7 @@
#include "filessettings.h"
#include "filespage.h"
-FilesPage::FilesPage( QWidget* parent ) : PageBase( parent ), m_URLChanged( false )
-+FilesPage::FilesPage() : PageBase(), m_URLChanged( false )
++FilesPage::FilesPage() : PageBase()
{
QWidget* page = new QWidget( this );
QVBoxLayout* layout = new QVBoxLayout( page );
-@@ -101,29 +101,29 @@
+@@ -50,9 +50,6 @@
+ m_secondURLComboBox->setObjectName( "DestURLComboBox" );
+ m_secondURLRequester = new KUrlRequester( m_secondURLComboBox, m_secondGB );
+
+- connect( m_firstURLRequester, SIGNAL( urlSelected( const QString & ) ), SLOT( setSecondURL( const QString & ) ) );
+- connect( m_secondURLRequester, SIGNAL( urlSelected( const QString & ) ), SLOT( setFirstURL( const QString & ) ) );
+-
+ m_thirdGB = new Q3GroupBox( 1, Qt::Vertical, i18n( "Encoding" ), page );
+ m_encodingComboBox = new QComboBox( false, m_thirdGB, "encoding_combobox" );
+ m_encodingComboBox->insertStringList( KGlobal::charsets()->availableEncodingNames() );
+@@ -101,29 +98,29 @@
{
// kDebug() << "first : " << m_firstURLComboBox->currentText() << endl;
// kDebug() << "second: " << m_secondURLComboBox->currentText() << endl;
@@ -4398,7 +3583,7 @@
m_encodingComboBox->setCurrentText( m_settings->m_encoding );
}
-@@ -143,10 +143,10 @@
+@@ -143,31 +140,11 @@
void FilesPage::setDefaults()
{
@@ -4413,9 +3598,30 @@
m_encodingComboBox->setCurrentText( "Default" );
}
+-void FilesPage::setFirstURL( const QString &url )
+-{
+- QString _url = url;
+- if ( !m_URLChanged )
+- {
+- m_firstURLRequester->setUrl( _url.remove( url.section( '/', -1 ) ) );
+- m_URLChanged = true;
+- }
+-}
+-
+-void FilesPage::setSecondURL( const QString &url )
+-{
+- QString _url = url;
+- if ( !m_URLChanged )
+- {
+- m_secondURLRequester->setUrl( _url.remove( url.section( '/', -1 ) ) );
+- m_URLChanged = true;
+- }
+-}
+-
+ #include "filespage.moc"
diff -Nur kdesdk-3.96.2-orig/kompare/libdialogpages/filespage.h kdesdk-3.96.2-fix-kompare/kompare/libdialogpages/filespage.h
--- kdesdk-3.96.2-orig/kompare/libdialogpages/filespage.h 2006-10-26 04:18:11.000000000 +0200
-+++ kdesdk-3.96.2-fix-kompare/kompare/libdialogpages/filespage.h 2007-12-06 02:55:06.000000000 +0100
++++ kdesdk-3.96.2-fix-kompare/kompare/libdialogpages/filespage.h 2007-12-10 12:20:22.000000000 +0100
@@ -37,7 +37,7 @@
{
Q_OBJECT
@@ -4425,6 +3631,17 @@
virtual ~FilesPage();
public:
+@@ -60,10 +60,6 @@
+ virtual void apply();
+ virtual void setDefaults();
+
+-protected slots:
+- void setFirstURL( const QString & );
+- void setSecondURL( const QString & );
+-
+ private:
+ Q3GroupBox* m_firstGB;
+ Q3GroupBox* m_secondGB;
diff -Nur kdesdk-3.96.2-orig/kompare/libdialogpages/filessettings.cpp kdesdk-3.96.2-fix-kompare/kompare/libdialogpages/filessettings.cpp
--- kdesdk-3.96.2-orig/kompare/libdialogpages/filessettings.cpp 2006-10-26 04:18:11.000000000 +0200
+++ kdesdk-3.96.2-fix-kompare/kompare/libdialogpages/filessettings.cpp 2007-12-04 19:30:38.000000000 +0100
Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kdesdk.spec 8 Dec 2007 00:40:37 -0000 1.78
+++ kdesdk.spec 10 Dec 2007 11:59:03 -0000 1.79
@@ -1,6 +1,6 @@
Name: kdesdk
Version: 3.97.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The KDE Software Development Kit (SDK)
Group: User Interface/Desktops
@@ -171,6 +171,9 @@
%{_kde4_libdir}/kde4/devel/*
%changelog
+* Mon Dec 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-2
+- updated fix-kompare patch (rev 5)
+
* Sat Dec 08 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-1
- update to 3.97.0 (KDE 4.0 RC2)
More information about the fedora-extras-commits
mailing list