[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [skrooge] /: Correction on list of bank
From:       Stephane Mankowski <stephane () mankowski ! fr>
Date:       2013-04-30 19:43:07
Message-ID: 20130430194307.1BCE1A603F () git ! kde ! org
[Download RAW message or body]

Git commit 24b73cb825b6efe90eaf4f9c79f8faf3996d51e0 by Stephane Mankowski.
Committed on 30/04/2013 at 21:42.
Pushed by smankowski into branch 'master'.

Correction on list of bank

R  +0    -0    images/logos/l10n/au/list_bank.txt [from: \
images/logos/l10n/en_AU/list_bank.txt - 100% similarity] R  +0    -0    \
images/logos/l10n/us/list_bank.txt [from: images/logos/l10n/en_US/list_bank.txt - \
100% similarity] R  +0    -0    images/logos/l10n/za/list_bank.txt [from: \
images/logos/l10n/en_ZA/list_bank.txt - 100% similarity] M  +1    -1    \
plugins/generic/skg_file/skgfileplugin.cpp M  +43   -41   skgbasegui/skgmainpanel.cpp

http://commits.kde.org/skrooge/24b73cb825b6efe90eaf4f9c79f8faf3996d51e0

diff --git a/images/logos/l10n/en_AU/list_bank.txt \
b/images/logos/l10n/au/list_bank.txt similarity index 100%
rename from images/logos/l10n/en_AU/list_bank.txt
rename to images/logos/l10n/au/list_bank.txt
diff --git a/images/logos/l10n/en_US/list_bank.txt \
b/images/logos/l10n/us/list_bank.txt similarity index 100%
rename from images/logos/l10n/en_US/list_bank.txt
rename to images/logos/l10n/us/list_bank.txt
diff --git a/images/logos/l10n/en_ZA/list_bank.txt \
b/images/logos/l10n/za/list_bank.txt similarity index 100%
rename from images/logos/l10n/en_ZA/list_bank.txt
rename to images/logos/l10n/za/list_bank.txt
diff --git a/plugins/generic/skg_file/skgfileplugin.cpp \
b/plugins/generic/skg_file/skgfileplugin.cpp index 16f59ee..7544648 100644
--- a/plugins/generic/skg_file/skgfileplugin.cpp
+++ b/plugins/generic/skg_file/skgfileplugin.cpp
@@ -53,7 +53,7 @@ K_PLUGIN_FACTORY(SKGFilePluginFactory, \
                registerPlugin<SKGFilePlugin>();)
  */
 K_EXPORT_PLUGIN(SKGFilePluginFactory("skg_file", "skg_file"))
 
-SKGFilePlugin::SKGFilePlugin(QWidget* /*iWidget*/, QObject* iParent, const \
QVariantList& /*iArg*/) : SKGInterfacePlugin(iParent) \
+SKGFilePlugin::SKGFilePlugin(QWidget* /*iWidget*/, QObject* iParent, const \
QVariantList& /*iArg*/) : SKGInterfacePlugin(iParent), m_recentFiles(NULL)  {
     SKGTRACEIN(10, "SKGFilePlugin::SKGFilePlugin");
 
diff --git a/skgbasegui/skgmainpanel.cpp b/skgbasegui/skgmainpanel.cpp
index c74402d..0af0f9a 100644
--- a/skgbasegui/skgmainpanel.cpp
+++ b/skgbasegui/skgmainpanel.cpp
@@ -159,52 +159,54 @@ SKGMainPanel::SKGMainPanel(KSplashScreen* iSplashScreen, \
SKGDocument* iDocument,  KPluginFactory* factory = loader.factory();
             if (factory) {
                 SKGInterfacePlugin* pluginInterface = \
                factory->create<SKGInterfacePlugin> (this);
-                if (pluginInterface && pluginInterface->isEnabled() && \
                pluginInterface->setupActions(getDocument(), iArguments)) {
-                    //Add plugin in about
-                    if (about) {
-                        QString author = \
                service->property("X-KDE-PluginInfo-Author", \
                QVariant::String).toString();
-                        if (!author.isEmpty()) {
-                            QString authorId;
-                            QStringList authors = SKGServices::splitCSVLine(author, \
                ',');
-                            if (authors.count() == 2) {
-                                author = authors.at(0);
-                                authorId = authors.at(1);
-                            }
-                            int pos = listAuthors.indexOf(author);
-                            if (pos == -1) {
-                                listAuthors.push_back(author);
-                                listTasks.push_back(i18n("Developer of plugin '%1'", \
                name));
-                                listEmails.push_back(email);
-                                listOscs.push_back(authorId);
-                            } else {
-                                listTasks[pos] += i18n(", '%1'", name);
+                if (pluginInterface) {
+                    if (pluginInterface->isEnabled() && \
pluginInterface->setupActions(getDocument(), iArguments)) { +                        \
//Add plugin in about +                        if (about) {
+                            QString author = \
service->property("X-KDE-PluginInfo-Author", QVariant::String).toString(); +          \
if (!author.isEmpty()) { +                                QString authorId;
+                                QStringList authors = \
SKGServices::splitCSVLine(author, ','); +                                if \
(authors.count() == 2) { +                                    author = authors.at(0);
+                                    authorId = authors.at(1);
+                                }
+                                int pos = listAuthors.indexOf(author);
+                                if (pos == -1) {
+                                    listAuthors.push_back(author);
+                                    listTasks.push_back(i18n("Developer of plugin \
'%1'", name)); +                                    listEmails.push_back(email);
+                                    listOscs.push_back(authorId);
+                                } else {
+                                    listTasks[pos] += i18n(", '%1'", name);
+                                }
                             }
                         }
-                    }
 
-                    //Store plugin
-                    int nbplugin = m_pluginsList.count();
-                    int pos = nbplugin;
-                    for (int j = nbplugin - 1; j >= 0; --j) {
-                        if (pluginInterface->getOrder() < \
                m_pluginsList.at(j)->getOrder()) {
-                            pos = j;
+                        //Store plugin
+                        int nbplugin = m_pluginsList.count();
+                        int pos = nbplugin;
+                        for (int j = nbplugin - 1; j >= 0; --j) {
+                            if (pluginInterface->getOrder() < \
m_pluginsList.at(j)->getOrder()) { +                                pos = j;
+                            }
                         }
-                    }
 
-                    m_pluginsList.insert(pos, pluginInterface);
-                    pluginInterface->setObjectName(id);
-
-                    //Build temporary tips file
-                    if (tipsFileOpened) {
-                        QStringList tipsList = pluginInterface->tips();
-                        int nbtips = tipsList.count();
-                        for (int t = 0; t < nbtips; ++t) {
-                            tipsFound = true;
-                            stream << "<tip category=\""
-                                   << id
-                                   << "\"><html>" << \
                SKGServices::stringToHtml(tipsList.at(t))
-                                   << "</html></tip>"
-                                   << endl;
+                        m_pluginsList.insert(pos, pluginInterface);
+                        pluginInterface->setObjectName(id);
+
+                        //Build temporary tips file
+                        if (tipsFileOpened) {
+                            QStringList tipsList = pluginInterface->tips();
+                            int nbtips = tipsList.count();
+                            for (int t = 0; t < nbtips; ++t) {
+                                tipsFound = true;
+                                stream << "<tip category=\""
+                                       << id
+                                       << "\"><html>" << \
SKGServices::stringToHtml(tipsList.at(t)) +                                       << \
"</html></tip>" +                                       << endl;
+                            }
                         }
                     }
                 }


[prev in list] [next in list] [prev in thread] [next in thread]