Hello community, here is the log from the commit of package fate for openSUSE:Factory checked in at 2017-06-28 10:37:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fate (Old) and /work/SRC/openSUSE:Factory/.fate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fate" Wed Jun 28 10:37:23 2017 rev:8 rq:506505 version:1.6.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/fate/fate.changes 2017-06-24 08:34:58.731938395 +0200 +++ /work/SRC/openSUSE:Factory/.fate.new/fate.changes 2017-06-28 10:37:28.001358357 +0200 @@ -1,0 +2,5 @@ +Tue Jun 27 10:17:54 UTC 2017 - [email protected] + +- bugfix: bring back signal FeatureMap::featureReloaded + +------------------------------------------------------------------- Old: ---- fate-20170623-c1270a95.tar.bz2 New: ---- fate-20170627-b434f6b5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fate.spec ++++++ --- /var/tmp/diff_new_pack.5nug0x/_old 2017-06-28 10:37:30.552997373 +0200 +++ /var/tmp/diff_new_pack.5nug0x/_new 2017-06-28 10:37:30.556996807 +0200 @@ -18,7 +18,7 @@ %define baseversion 1.6 %define patchlevel .0.1 -%define snapshot 20170623-c1270a95 +%define snapshot 20170627-b434f6b5 Name: fate Version: %{baseversion}%{patchlevel} Release: 0 ++++++ fate-20170623-c1270a95.tar.bz2 -> fate-20170627-b434f6b5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170623-c1270a95/src/fate/editor/simpleeditor.cpp new/fate-20170627-b434f6b5/src/fate/editor/simpleeditor.cpp --- old/fate-20170623-c1270a95/src/fate/editor/simpleeditor.cpp 2017-06-23 13:02:00.417130362 +0200 +++ new/fate-20170627-b434f6b5/src/fate/editor/simpleeditor.cpp 2017-06-27 16:44:59.458786761 +0200 @@ -135,7 +135,7 @@ { // Partner handling mPartnerCombo = addComboBox( i18n("Requesting Party") ); - connect( mPartnerCombo, SIGNAL( currentIndexChanged( const QString& ) ), + connect( mPartnerCombo, SIGNAL( activated( const QString& ) ), SLOT( slotPartnerChanged( const QString& ) ) ); QBoxLayout *partnerLayout @@ -187,7 +187,7 @@ SLOT(setPartnerContext())); } -bool PartnerPage::updatePartnerCombo(const QString &name) +void PartnerPage::updatePartnerCombo(const QString &name) { int index; @@ -201,17 +201,8 @@ } mPartnerCombo->setCurrentIndex(index); - return true; -} - -void PartnerPage::slotRMSClicked() -{ - updatePartnerCombo("RMS"); -} -void PartnerPage::slotPartnerChanged( const QString& newStr ) -{ - if ( newStr != "RMS" ) { + if ( name != "RMS" ) { mPartnerCombo->show(); mRMSLabel->hide(); if( Prefs::self()->stakeholderFunction() == Role::idProjectManager() || @@ -227,6 +218,25 @@ mRMSButton->hide(); } + bool state = (name != "RMS"); + + mExternalIdEdit->setEnabled( state ); + mNdaCheck->setEnabled( state ); + if( state && mNdaCheck->isChecked() ) { + mNdaExpiresEdit->setEnabled( state ); + } else { + mNdaExpiresEdit->setEnabled( false ); + } +} + +void PartnerPage::slotRMSClicked() +{ + slotPartnerChanged("RMS"); +} + +void PartnerPage::slotPartnerChanged( const QString& newStr ) +{ + updatePartnerCombo(newStr); if ( !mFeature || newStr == mFeature->partnerContext().organization ) return; @@ -261,19 +271,7 @@ } } } - - bool state = true; - if( newStr == "RMS" || newStr.isEmpty() ) { - state = false; - } - - mExternalIdEdit->setEnabled( state ); - mNdaCheck->setEnabled( state ); - if( state && mNdaCheck->isChecked() ) { - mNdaExpiresEdit->setEnabled( state ); - } else { - mNdaExpiresEdit->setEnabled( false ); - } + // write back the changes to the feature object setPartnerContext(); } @@ -324,10 +322,7 @@ mExternalIdEdit->setText( p.externalId ); mNdaExpiresEdit->setText( p.nda ); mNdaCheck->setChecked( !p.nda.isEmpty() ); - - slotPartnerChanged( mPartnerCombo->currentText() ); enableNdaExpires(); - mUseCaseEdit->setPlainText( mFeature->useCase() ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170623-c1270a95/src/fate/editor/simpleeditor.h new/fate-20170627-b434f6b5/src/fate/editor/simpleeditor.h --- old/fate-20170623-c1270a95/src/fate/editor/simpleeditor.h 2017-06-23 13:02:00.417130362 +0200 +++ new/fate-20170627-b434f6b5/src/fate/editor/simpleeditor.h 2017-06-27 16:44:59.458786761 +0200 @@ -84,7 +84,7 @@ void setPartners( const QStringList& list ); protected: - bool updatePartnerCombo(const QString &); + void updatePartnerCombo(const QString &); protected slots: void enableNdaExpires(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170623-c1270a95/src/fate/mainview.cpp new/fate-20170627-b434f6b5/src/fate/mainview.cpp --- old/fate-20170623-c1270a95/src/fate/mainview.cpp 2017-06-23 13:02:00.421130381 +0200 +++ new/fate-20170627-b434f6b5/src/fate/mainview.cpp 2017-06-27 16:44:59.462786781 +0200 @@ -199,11 +199,11 @@ connect( &mFeatureMap, SIGNAL( featureChanged( Feature * ) ), mFeatureListView, SLOT( updateFeature( Feature * ) ) ); + connect( &mFeatureMap, SIGNAL( featureReloaded( Feature * ) ), + mFeatureListView, SLOT( updateFeature( Feature * ) ) ); connect( &mFeatureMap, SIGNAL( dataChanged() ), SLOT( slotFeatureDataChanged() ) ); - - // Thinks we do not need that in the end ... - connect( &mFeatureMap, SIGNAL( featureChanged( Feature * ) ), + connect( &mFeatureMap, SIGNAL( featureReloaded( Feature * ) ), SLOT( slotFeatureReloaded( Feature * ) ) ); connect( &mFeatureMap, SIGNAL( connectionEstablished( bool ) ), SIGNAL( connectionEstablished( bool ) ) ); @@ -478,11 +478,6 @@ if ( execQuery ) doQuery( q ); } -void MainView::createStatistics() -{ - mStatisticsView->reload(); -} - void MainView::checkUserOnStartup() { QString username = Prefs::self()->serverUser(); @@ -1870,8 +1865,6 @@ mFeatureListView->updateQueryTitle( mFeatureMap.currentQuery().title() ); mFeatureListView->updateProductList( mFeatureMap.productList() ); - this->createStatistics(); - StartupSequence::self()->setPrecondition( StartupSequence::StartupQueryDone, true ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170623-c1270a95/src/fate/mainview.h new/fate-20170627-b434f6b5/src/fate/mainview.h --- old/fate-20170623-c1270a95/src/fate/mainview.h 2017-06-23 13:02:00.421130381 +0200 +++ new/fate-20170627-b434f6b5/src/fate/mainview.h 2017-06-27 16:44:59.462786781 +0200 @@ -86,7 +86,6 @@ QString replaceTagsInWord( const QString&, QMap<QString, QString> ) const; TextTemplate simpleOdt( const QString& ); TextTemplate mgeOdt( const QString&, const QString& ); - void createStatistics(); public slots: void newFeature(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170623-c1270a95/src/fate/statisticsview.cpp new/fate-20170627-b434f6b5/src/fate/statisticsview.cpp --- old/fate-20170623-c1270a95/src/fate/statisticsview.cpp 2017-06-23 13:02:00.425130400 +0200 +++ new/fate-20170627-b434f6b5/src/fate/statisticsview.cpp 2017-06-27 16:44:59.466786801 +0200 @@ -2,8 +2,10 @@ This file is part of Fate. Copyright (c) 2007 SUSE LINUX Products GmbH + 2016 SUSE Linux GmbH Author: Andre Duffeck <[email protected]> + Joachim Plack <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -55,6 +57,16 @@ connect( mProductCombo, SIGNAL( activated ( const QString & ) ), SLOT( slotProductChosen( const QString & ) ) ); + // recalculate the statistic once the data set changes + connect( mFeatureMap, SIGNAL( dataChanged() ), + SLOT( reload() ) ); + connect( mFeatureMap, SIGNAL( featureChanged( Feature * ) ), + SLOT( reload() ) ); + connect( mFeatureMap, SIGNAL( queryDone( bool ) ), + SLOT( reload() ) ); + connect( mFeatureMap, SIGNAL( featuresModified() ), + SLOT( reload() ) ); + mHtmlView = new KHTMLPart( this ); headerLayout->setMargin( KDialog::marginHint() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170623-c1270a95/src/fate/statisticsview.h new/fate-20170627-b434f6b5/src/fate/statisticsview.h --- old/fate-20170623-c1270a95/src/fate/statisticsview.h 2017-06-23 13:02:00.425130400 +0200 +++ new/fate-20170627-b434f6b5/src/fate/statisticsview.h 2017-06-27 16:44:59.466786801 +0200 @@ -2,8 +2,10 @@ This file is part of Fate. Copyright (c) 2007 SUSE LINUX Products GmbH + 2016 SUSE Linux GmbH Author: Andre Duffeck <[email protected]> + Joachim Plack <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -39,16 +41,15 @@ public: StatisticsView( FeatureMap *, QWidget *parent ); - void reload(); + protected: void render(); void createStatistics(); - - protected: void writeStatusRow( ProductContext::Status ); void writeActorRow( const QString &, int ); protected slots: void slotProductChosen( const QString & ); + void reload(); private: QString mHtml; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170623-c1270a95/src/libfate/featuremap.cpp new/fate-20170627-b434f6b5/src/libfate/featuremap.cpp --- old/fate-20170623-c1270a95/src/libfate/featuremap.cpp 2017-06-23 13:02:00.425130400 +0200 +++ new/fate-20170627-b434f6b5/src/libfate/featuremap.cpp 2017-06-27 16:44:59.466786801 +0200 @@ -708,9 +708,7 @@ QString msg = i18n("Reloaded feature #%1%2").arg( f->id() ).arg( s ); emit statusMessage( msg ); - - f->setModified( false ); - emit featureChanged( f ); + emit featureReloaded( f ); if( mCache ) { mCache->removeModifiedItem( f->id() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fate-20170623-c1270a95/src/libfate/featuremap.h new/fate-20170627-b434f6b5/src/libfate/featuremap.h --- old/fate-20170623-c1270a95/src/libfate/featuremap.h 2017-06-23 13:02:00.425130400 +0200 +++ new/fate-20170627-b434f6b5/src/libfate/featuremap.h 2017-06-27 16:44:59.466786801 +0200 @@ -111,8 +111,8 @@ // a new feature has been added to the feature map void featureAdded( Feature * ); - // a feature in the map has been changed void featureChanged( Feature * ); + void featureReloaded( Feature * ); // passthrough signal from QueryEngine void connectionEstablished( bool );
