/***************************************************************************
- * Copyright (C) 2009 by Peter Penz <peter.penz@gmx.at> *
+ * Copyright (C) 2009-2010 by Peter Penz <peter.penz@gmx.at> *
* *
* 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 *
#include "servicessettingspage.h"
+#include "dolphin_versioncontrolsettings.h"
+
#include <kconfig.h>
#include <kconfiggroup.h>
#include <kdesktopfileactions.h>
#include <kicon.h>
#include <klocale.h>
+#include <kmessagebox.h>
#include <knewstuff3/knewstuffbutton.h>
#include <kservice.h>
#include <kservicetypetrader.h>
#include <kstandarddirs.h>
+#include <QCheckBox>
#include <QEvent>
+#include <QGridLayout>
+#include <QGroupBox>
#include <QLabel>
#include <QListWidget>
#include <QPushButton>
-#include <QVBoxLayout>
ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) :
SettingsPageBase(parent),
m_initialized(false),
- m_servicesList(0)
+ m_servicesList(0),
+ m_vcsGroupBox(0),
+ m_vcsPluginsMap(),
+ m_enabledVcsPlugins()
{
QVBoxLayout* topLayout = new QVBoxLayout(this);
KNS3::Button* downloadButton = new KNS3::Button(i18nc("@action:button", "Download New Services..."),
"servicemenu.knsrc",
this);
- connect(downloadButton, SIGNAL(dialogFinished(const Entry::List&)), this, SLOT(loadServices()));
+ connect(downloadButton, SIGNAL(dialogFinished(KNS3::Entry::List)), this, SLOT(loadServices()));
+
+ m_vcsGroupBox = new QGroupBox(i18nc("@title:group", "Version Control Systems"), this);
+ // Only show the version control group box, if a version
+ // control system could be found (see loadVersionControlSystems())
+ m_vcsGroupBox->hide();
topLayout->addWidget(label);
topLayout->addWidget(m_servicesList);
topLayout->addWidget(downloadButton);
+ topLayout->addWidget(m_vcsGroupBox);
+
+ m_enabledVcsPlugins = VersionControlSettings::enabledPlugins();
}
ServicesSettingsPage::~ServicesSettingsPage()
void ServicesSettingsPage::applySettings()
{
+ // Apply service menu settings
KConfig config("kservicemenurc", KConfig::NoGlobals);
KConfigGroup showGroup = config.group("Show");
}
showGroup.sync();
+
+ // Apply version control settings
+ QStringList enabledPlugins;
+ QMap<QString, QCheckBox*>::const_iterator it = m_vcsPluginsMap.constBegin();
+ while (it != m_vcsPluginsMap.constEnd()) {
+ if (it.value()->isChecked()) {
+ enabledPlugins.append(it.key());
+ }
+ ++it;
+ }
+
+ if (m_enabledVcsPlugins != enabledPlugins) {
+ VersionControlSettings::setEnabledPlugins(enabledPlugins);
+ VersionControlSettings::self()->writeConfig();
+
+ KMessageBox::information(window(),
+ i18nc("@info", "Dolphin must be restarted to apply the "
+ "updated version control systems settings."),
+ QString(), // default title
+ QLatin1String("ShowVcsRestartInformation"));
+ }
}
void ServicesSettingsPage::restoreDefaults()
{
if ((event->type() == QEvent::Polish) && !m_initialized) {
QMetaObject::invokeMethod(this, "loadServices", Qt::QueuedConnection);
+ QMetaObject::invokeMethod(this, "loadVersionControlSystems", Qt::QueuedConnection);
m_initialized = true;
}
return SettingsPageBase::event(event);
}
}
+void ServicesSettingsPage::loadVersionControlSystems()
+{
+ const QStringList enabledPlugins = VersionControlSettings::enabledPlugins();
+
+ // Create a checkbox for each available version control plugin
+ const KService::List pluginServices = KServiceTypeTrader::self()->query("FileViewVersionControlPlugin");
+ for (KService::List::ConstIterator it = pluginServices.constBegin(); it != pluginServices.constEnd(); ++it) {
+ const QString pluginName = (*it)->name();
+ QCheckBox* checkBox = new QCheckBox(pluginName, m_vcsGroupBox);
+ checkBox->setChecked(enabledPlugins.contains(pluginName));
+ connect(checkBox, SIGNAL(clicked()), this, SIGNAL(changed()));
+ connect(checkBox, SIGNAL(clicked()), this, SLOT(feffi()));
+ m_vcsPluginsMap.insert(pluginName, checkBox);
+ }
+
+ // Add the checkboxes into a grid layout of 2 columns
+ QGridLayout* layout = new QGridLayout(m_vcsGroupBox);
+ const int maxRows = (m_vcsPluginsMap.count() + 1) / 2;
+
+ int index = 0;
+ QMap<QString, QCheckBox*>::const_iterator it = m_vcsPluginsMap.constBegin();
+ while (it != m_vcsPluginsMap.constEnd()) {
+ const int column = index / maxRows;
+ const int row = index % maxRows;
+ layout->addWidget(it.value(), row, column);
+ ++it;
+ ++index;
+ }
+
+ m_vcsGroupBox->setVisible(!m_vcsPluginsMap.isEmpty());
+}
+
bool ServicesSettingsPage::isInServicesList(const QString& service) const
{
const int count = m_servicesList->count();
}
m_plugin = searchPlugin(versionControlUrl);
- const bool foundVersionInfo = (m_plugin != 0);
- if (!foundVersionInfo && m_versionedDirectory) {
- // Version control systems like Git provide the version information
- // file only in the root directory. Check whether the version information file can
- // be found in one of the parent directories.
-
- // TODO...
- }
-
- if (foundVersionInfo) {
+ if (m_plugin != 0) {
if (!m_versionedDirectory) {
m_versionedDirectory = true;
static QList<KVersionControlPlugin*> plugins;
if (!pluginsAvailable) {
- // a searching for plugins has already been done, but no
+ // A searching for plugins has already been done, but no
// plugins are installed
return 0;
}
if (plugins.isEmpty()) {
// No searching for plugins has been done yet. Query the KServiceTypeTrader for
// all fileview version control plugins and remember them in 'plugins'.
- const QString disabledPlugins = VersionControlSettings::disabledPlugins();
- const QStringList disabledPluginsList = disabledPlugins.split(',');
+ const QStringList enabledPlugins = VersionControlSettings::enabledPlugins();
const KService::List pluginServices = KServiceTypeTrader::self()->query("FileViewVersionControlPlugin");
for (KService::List::ConstIterator it = pluginServices.constBegin(); it != pluginServices.constEnd(); ++it) {
- if (!disabledPluginsList.contains((*it)->name())) {
+ if (enabledPlugins.contains((*it)->name())) {
KVersionControlPlugin* plugin = (*it)->createInstance<KVersionControlPlugin>();
Q_ASSERT(plugin != 0);
plugins.append(plugin);
}
}
- // verify whether the current directory contains revision information
+ // Verify whether the current directory contains revision information
// like .svn, .git, ...
foreach (KVersionControlPlugin* plugin, plugins) {
- KUrl fileUrl = directory;
+ // Use the KDirLister cache to check for .svn, .git, ... files
+ KUrl dirUrl(directory);
+ KUrl fileUrl = dirUrl;
fileUrl.addPath(plugin->fileName());
const KFileItem item = m_dirLister->findByUrl(fileUrl);
if (!item.isNull()) {
return plugin;
}
+
+ // Version control systems like Git provide the version information
+ // file only in the root directory. Check whether the version information file can
+ // be found in one of the parent directories. For performance reasons this
+ // step is only done, if the previous directory was marked as versioned by
+ // m_versionedDirectory. Drawback: Until e. g. Git is recognized, the root directory
+ // must be shown at least once.
+ if (m_versionedDirectory) {
+ KUrl upUrl = dirUrl.upUrl();
+ while (upUrl != dirUrl) {
+ const QString filePath = dirUrl.pathOrUrl(KUrl::AddTrailingSlash) + plugin->fileName();
+ QFileInfo file(filePath);
+ if (file.exists()) {
+ return plugin;
+ }
+ dirUrl = upUrl;
+ upUrl = dirUrl.upUrl();
+ }
+ }
}
return 0;
projects / dolphin.git / commitdiff