[kde-doc-english] [skrooge/kf5] /: Merge branch 'master' of kde:skrooge into kf5

[Stephane Mankowski]

Git commit aab11a487224fd7c89a57f18b1d6a935cdb359b5 by Stephane Mankowski.
Committed on 24/04/2015 at 19:58.
Pushed by smankowski into branch 'kf5'.

Merge branch 'master' of kde:skrooge into kf5

Conflicts:
	skrooge/CMakeLists.txt

M  +5    -0    CHANGELOG
M  +1    -1    doc/index.docbook
M  +1    -1    plugins/generic/skg_advice/skgadviceboardwidget.cpp
M  +17   -1    plugins/generic/skg_bookmark/skgbookmarkplugindockwidget.cpp
M  +1    -1    plugins/generic/skg_debug/skgdebugpluginwidget.cpp
M  +4    -0    plugins/generic/skg_highlight/skghighlightplugin.cpp
M  +3    -0    plugins/skrooge/skrooge_bank/skgbankplugin.cpp
M  +6    -0    plugins/skrooge/skrooge_bank/skgbankpluginwidget.cpp
M  +23   -5    plugins/skrooge/skrooge_budget/skgbudgetpluginwidget.cpp
M  +6    -0    plugins/skrooge/skrooge_calculator/skgcalculatorpluginwidget.cpp
M  +12   -1    plugins/skrooge/skrooge_categories/skgcategoriespluginwidget.cpp
M  +3    -0    plugins/skrooge/skrooge_importexport/skgimportexportplugin.cpp
M  +19   -0    plugins/skrooge/skrooge_operation/skgoperationplugin.cpp
M  +58   -2    plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp
M  +10   -0    plugins/skrooge/skrooge_payee/skgpayeepluginwidget.cpp
M  +14   -1    plugins/skrooge/skrooge_scheduled/skgscheduledplugin.cpp
M  +3    -0    plugins/skrooge/skrooge_scheduled/skgscheduledpluginwidget.cpp
M  +22   -0    plugins/skrooge/skrooge_search/skgsearchpluginwidget.cpp
M  +7    -0    plugins/skrooge/skrooge_tracker/skgtrackerpluginwidget.cpp
M  +13   -3    plugins/skrooge/skrooge_unit/skgunitplugin.cpp
M  +11   -1    plugins/skrooge/skrooge_unit/skgunitpluginwidget.cpp
M  +37   -10   skgbankgui/skgobjectmodel.cpp
M  +122  -91   skgbankgui/skgquerycreator.cpp
M  +1    -1    skgbankmodeler/skgaccountobject.cpp
M  +2    -2    skgbankmodeler/skgcategoryobject.cpp
M  +1    -1    skgbankmodeler/skgoperationobject.cpp
M  +1    -1    skgbankmodeler/skgpayeeobject.cpp
M  +129  -125  skgbankmodeler/skgruleobject.cpp
M  +1    -1    skgbankmodeler/skgtrackerobject.cpp
M  +1    -1    skgbankmodeler/skgunitobject.cpp
M  +1    -1    skgbasegui/skgmainpanel.cpp
M  +6    -2    skgbasegui/skgobjectmodelbase.cpp
M  +1    -8    skgbasegui/skgtreeview.cpp
M  +12   -2    skgbasemodeler/skgobjectbase.cpp
M  +82   -0    skgbasemodeler/skgservices.cpp
M  +10   -0    skgbasemodeler/skgservices.h
M  +1    -0    skrooge/CMakeLists.txt

http://commits.kde.org/skrooge/aab11a487224fd7c89a57f18b1d6a935cdb359b5

diff --cc CHANGELOG
index 2e1c636,3ab39c0..3e7656b
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,8 -1,10 +1,13 @@@
 +skrooge (2.0.0)  
 +  *Correction: Porting on KF5 / QT5
 +  
  skrooge (1.12.0)  
    *Correction bug 345974: Skrooge alarms keep firing up regardless of specified alert amount
+   *Correction bug 346151: Fast edition don't fill operation sign
+   *Correction bug 345998: Add tooltip for all history actions
+   *Correction bug 345799: Moved then hiden column displayed 
+   *New feature: Automatic point operations created during reconciliation  
+   *New feature: "Simple" mode in "Search and process" page 
    *Performances: Better performances on selection change in "operation" page
  
   -- Stephane MANKOWSKI <stephane at mankowski.fr>  xxx
diff --cc skgbankgui/skgquerycreator.cpp
index 7e305b0,0a20d1a..36db965
--- a/skgbankgui/skgquerycreator.cpp
+++ b/skgbankgui/skgquerycreator.cpp
@@@ -35,14 -35,13 +35,13 @@@ SKGQueryCreator::SKGQueryCreator(QWidge
  {
      ui.setupUi(this);
  
 -    ui.kList->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
 -    ui.kList->verticalHeader()->setResizeMode(QHeaderView::Fixed);
 +    ui.kList->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
 +    ui.kList->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
      ui.kList->setWordWrap(false);
 -    ui.kList->horizontalHeader()->setMovable(true);
 +    ui.kList->horizontalHeader()->setSectionsMovable(true);
  
 -    connect(ui.kList, SIGNAL(removeLine(int)), this, SLOT(removeLine(int)));
 +    connect(ui.kList, &SKGTableWidget::removeLine, this, &SKGQueryCreator::removeLine);
  
- 
      addNewLine();
  }
  
diff --cc skgbasemodeler/skgobjectbase.cpp
index ec2e06f,c12e501..8ea8d59
--- a/skgbasemodeler/skgobjectbase.cpp
+++ b/skgbasemodeler/skgobjectbase.cpp
@@@ -507,8 -511,13 +512,13 @@@ SKGError SKGObjectBase::setProperty(con
  
  SKGError SKGObjectBase::setProperty(const QString& iName, const QString& iValue, const QVariant& iBlob, SKGPropertyObject* oObjectCreated) const
  {
-     return Q_UNLIKELY(!getDocument()) ? SKGError() :  getDocument()->setParameter(iName, iValue, iBlob, getUniqueID(), oObjectCreated);
+     SKGError err = Q_UNLIKELY(!getDocument()) ? SKGError() :  getDocument()->setParameter(iName, iValue, iBlob, getUniqueID(), oObjectCreated);
+ 
+     // Send message
+     IFOKDO(err, getDocument()->sendMessage(i18nc("An information to the user", "The property '%1=%2' has been added on '%3'", iName, iValue, getDisplayName()), SKGDocument::Hidden));
+ 
+     return err;
  }
  
 -#include "skgobjectbase.moc"
 +
  
diff --cc skrooge/CMakeLists.txt
index 82c6d73,a455d2c..dab6b02
--- a/skrooge/CMakeLists.txt
+++ b/skrooge/CMakeLists.txt
@@@ -36,8 -37,9 +36,9 @@@ TARGET_LINK_LIBRARIES(skrooge KF5::DBus
  
  ########### install files ###############
  INSTALL(TARGETS skrooge ${INSTALL_TARGETS_DEFAULT_ARGS} )
 -INSTALL(PROGRAMS skrooge.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
 +INSTALL(PROGRAMS org.kde.skrooge.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
+ INSTALL(FILES skrooge.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata )
 -INSTALL(DIRECTORY theme DESTINATION ${DATA_INSTALL_DIR}/skrooge FILES_MATCHING PATTERN "*.css"
 +INSTALL(DIRECTORY theme DESTINATION ${KDE_INSTALL_DATADIR}/skrooge FILES_MATCHING PATTERN "*.css"
  PATTERN ".svn" EXCLUDE
  PATTERN "CMakeFiles" EXCLUDE
  PATTERN "Testing" EXCLUDE)