Hello community, here is the log from the commit of package dolphin-plugins for openSUSE:Factory checked in at 2016-05-29 03:08:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dolphin-plugins (Old) and /work/SRC/openSUSE:Factory/.dolphin-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dolphin-plugins" Changes: -------- --- /work/SRC/openSUSE:Factory/dolphin-plugins/dolphin-plugins.changes 2016-03-29 09:56:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dolphin-plugins.new/dolphin-plugins.changes 2016-05-29 03:08:30.000000000 +0200 @@ -1,0 +2,24 @@ +Sat May 7 10:11:26 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + +------------------------------------------------------------------- +Sun Apr 17 05:50:46 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + +------------------------------------------------------------------- +Mon Apr 11 06:31:26 UTC 2016 - [email protected] + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + +------------------------------------------------------------------- Old: ---- dolphin-plugins-15.12.3.tar.xz New: ---- dolphin-plugins-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dolphin-plugins.spec ++++++ --- /var/tmp/diff_new_pack.LZW54x/_old 2016-05-29 03:08:32.000000000 +0200 +++ /var/tmp/diff_new_pack.LZW54x/_new 2016-05-29 03:08:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: dolphin-plugins -Version: 15.12.3 +Version: 16.04.1 Release: 0 Summary: Version control plugins for Dolphin License: GPL-2.0+ ++++++ dolphin-plugins-15.12.3.tar.xz -> dolphin-plugins-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-15.12.3/hg/commitdialog.cpp new/dolphin-plugins-16.04.1/hg/commitdialog.cpp --- old/dolphin-plugins-15.12.3/hg/commitdialog.cpp 2015-11-15 16:08:41.000000000 +0100 +++ new/dolphin-plugins-16.04.1/hg/commitdialog.cpp 2015-12-29 11:14:52.000000000 +0100 @@ -30,6 +30,7 @@ #include <QMenu> #include <QAction> #include <QLineEdit> +#include <QSplitter> #include <KTextEditor/Document> #include <KTextEditor/View> #include <KTextEditor/Editor> @@ -111,8 +112,12 @@ // the commit box itself QGroupBox *messageGroupBox = new QGroupBox; QVBoxLayout *commitLayout = new QVBoxLayout; - m_commitMessage = new QPlainTextEdit; - commitLayout->addWidget(m_commitMessage); + m_commitMessage = editor->createDocument(0); + KTextEditor::View *messageView = + qobject_cast<KTextEditor::View*>(m_commitMessage->createView(this)); + messageView->setStatusBarEnabled(false); + messageView->setMinimumHeight(fontMetrics().height() * 4); + commitLayout->addWidget(messageView); messageGroupBox->setTitle(xi18nc("@title:group", "Commit Message")); messageGroupBox->setLayout(commitLayout); @@ -124,20 +129,18 @@ diffGroupBox->setLayout(diffLayout); // Set up layout for Status, Commit and Diff boxes - QGridLayout *bodyLayout = new QGridLayout; + m_verticalSplitter = new QSplitter(Qt::Horizontal); + m_horizontalSplitter = new QSplitter(Qt::Vertical); + m_horizontalSplitter->addWidget(messageGroupBox); + m_horizontalSplitter->addWidget(diffGroupBox); m_statusList = new HgStatusList; - bodyLayout->addWidget(m_statusList, 0, 0, 0, 1); - bodyLayout->addWidget(messageGroupBox, 0, 1); - bodyLayout->addWidget(diffGroupBox, 1, 1); - bodyLayout->setColumnStretch(0, 1); - bodyLayout->setColumnStretch(1, 2); - bodyLayout->setRowStretch(0, 1); - bodyLayout->setRowStretch(1, 1); + m_verticalSplitter->addWidget(m_statusList); + m_verticalSplitter->addWidget(m_horizontalSplitter); // Set up layout and container for main dialog QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addLayout(topBarLayout); - mainLayout->addLayout(bodyLayout); + mainLayout->addWidget(m_verticalSplitter); layout()->insertLayout(0, mainLayout); slotBranchActions(m_useCurrentBranch); @@ -147,10 +150,15 @@ FileViewHgPluginSettings *settings = FileViewHgPluginSettings::self(); this->resize(QSize(settings->commitDialogWidth(), settings->commitDialogHeight())); - // + + m_verticalSplitter->setSizes(settings->verticalSplitterSizes()); + m_horizontalSplitter->setSizes(settings->horizontalSplitterSizes()); + + messageView->setFocus(); // message editor ready to get a text + connect(m_statusList, SIGNAL(itemSelectionChanged(const char, const QString &)), this, SLOT(slotItemSelectionChanged(const char, const QString &))); - connect(m_commitMessage, SIGNAL(textChanged()), + connect(m_commitMessage, SIGNAL(textChanged(KTextEditor::Document*)), this, SLOT(slotMessageChanged())); connect(this, SIGNAL(finished(int)), this, SLOT(saveGeometry())); } @@ -208,7 +216,7 @@ void HgCommitDialog::slotMessageChanged() { - okButton()->setDisabled(m_commitMessage->toPlainText().isEmpty()); + okButton()->setDisabled(m_commitMessage->isEmpty()); } void HgCommitDialog::done(int r) @@ -224,7 +232,7 @@ return; } } - bool success = hgWrapper->commit(m_commitMessage->toPlainText(), + bool success = hgWrapper->commit(m_commitMessage->text(), files, m_branchAction==CloseBranch); if (success) { QDialog::done(r); @@ -247,6 +255,8 @@ FileViewHgPluginSettings *settings = FileViewHgPluginSettings::self(); settings->setCommitDialogHeight(this->height()); settings->setCommitDialogWidth(this->width()); + settings->setHorizontalSplitterSizes(m_horizontalSplitter->sizes()); + settings->setVerticalSplitterSizes(m_verticalSplitter->sizes()); settings->save(); } @@ -366,7 +376,7 @@ void HgCommitDialog::slotInsertCopyMessage(QAction *action) { - m_commitMessage->insertPlainText(action->data().toString()); + m_commitMessage->setText(action->data().toString()); } #include "commitdialog.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-15.12.3/hg/commitdialog.h new/dolphin-plugins-16.04.1/hg/commitdialog.h --- old/dolphin-plugins-15.12.3/hg/commitdialog.h 2015-11-15 16:08:41.000000000 +0100 +++ new/dolphin-plugins-16.04.1/hg/commitdialog.h 2015-12-29 11:14:52.000000000 +0100 @@ -31,6 +31,7 @@ class QMenu; class QLabel; class QLineEdit; +class QSplitter; namespace KTextEditor { class View; @@ -82,7 +83,7 @@ private: QString m_hgBaseDir; - QPlainTextEdit *m_commitMessage; + KTextEditor::Document *m_commitMessage; HgStatusList *m_statusList; KTextEditor::View *m_fileDiffView; @@ -97,6 +98,9 @@ QMenu *m_branchMenu; QMenu *m_copyMessageMenu; + QSplitter *m_verticalSplitter; // Divides file list and editors + QSplitter *m_horizontalSplitter; // Divides commit editor and diff editor + /** What will commit do with branch. * * CloseBranch: Close the current branch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-15.12.3/hg/config-widgets/pluginsettings.cpp new/dolphin-plugins-16.04.1/hg/config-widgets/pluginsettings.cpp --- old/dolphin-plugins-15.12.3/hg/config-widgets/pluginsettings.cpp 2015-11-15 16:08:41.000000000 +0100 +++ new/dolphin-plugins-16.04.1/hg/config-widgets/pluginsettings.cpp 2015-12-29 11:14:52.000000000 +0100 @@ -40,6 +40,11 @@ this, SLOT(browse_diff())); } +HgPluginSettingsWidget::~HgPluginSettingsWidget() +{ + delete m_config; +} + void HgPluginSettingsWidget::saveConfig() { KConfigGroup group(m_config, QLatin1String("diff")); @@ -57,7 +62,7 @@ + QLatin1String("/dolphin-hg")); QFile::remove(oldPath); } - m_config = new KConfig("dolphin-hg", KConfig::SimpleConfig, + m_config = new KConfig(QLatin1String("dolphin-hg"), KConfig::SimpleConfig, QStandardPaths::GenericConfigLocation); KConfigGroup group(m_config, QLatin1String("diff")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-15.12.3/hg/config-widgets/pluginsettings.h new/dolphin-plugins-16.04.1/hg/config-widgets/pluginsettings.h --- old/dolphin-plugins-15.12.3/hg/config-widgets/pluginsettings.h 2015-11-15 16:08:41.000000000 +0100 +++ new/dolphin-plugins-16.04.1/hg/config-widgets/pluginsettings.h 2015-12-29 11:14:52.000000000 +0100 @@ -37,6 +37,7 @@ public: HgPluginSettingsWidget(QWidget *parent = 0); + virtual ~HgPluginSettingsWidget(); public slots: void saveConfig(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-15.12.3/hg/fileviewhgpluginsettings.kcfg new/dolphin-plugins-16.04.1/hg/fileviewhgpluginsettings.kcfg --- old/dolphin-plugins-15.12.3/hg/fileviewhgpluginsettings.kcfg 2015-11-15 16:08:41.000000000 +0100 +++ new/dolphin-plugins-16.04.1/hg/fileviewhgpluginsettings.kcfg 2015-12-29 11:14:52.000000000 +0100 @@ -13,6 +13,14 @@ <default>900</default> <min>500</min> </entry> + <entry name="verticalSplitterSizes" type="IntList"> + <label>Divides file list and editors with commit details</label> + <default>200,700</default> + </entry> + <entry name="horizontalSplitterSizes" type="IntList"> + <label>Divides commit editor and diff editor</label> + <default>100,350</default> + </entry> </group> <group name="ConfigDialogSettings"> <entry name="configDialogHeight" type="Int">
