Browse Source

[TRD] Traduction en français en cours ...

master
Ulrich Van Den Hekke 12 years ago
parent
commit
211cf6dbfe
  1. 3
      CMakeLists.txt
  2. 1408
      Doxyfile
  3. 27
      cmake_modules/UseXinx.cmake
  4. 2
      components/translations/xinxcmp_en.ts
  5. 89
      components/translations/xinxcmp_fr.ts
  6. 52485
      doc/qt-doc.tag
  7. 22
      framework/application/aboutdialogimpl.cpp
  8. 12
      framework/application/aboutdialogimpl.h
  9. 103
      framework/application/customdialog/customdialogimpl.cpp
  10. 7
      framework/application/customdialog/customdialogimpl.h
  11. 4
      framework/application/customdialog/ui/customdialog.ui
  12. 7
      framework/project/xinxprojectproject.cpp
  13. 244
      framework/translations/framework_en.ts
  14. 1817
      framework/translations/framework_fr.ts
  15. 8
      plugins/core/actions/validationaction.cpp
  16. 3
      plugins/core/actions/validationaction.h
  17. 35
      plugins/core/actions/validationaction_p.h
  18. 125
      plugins/core/docks/datastream/xquerydialogimpl.cpp
  19. 44
      plugins/core/docks/datastream/xquerydialogimpl_p.h
  20. 235
      plugins/core/translations/coreplugin_en.ts
  21. 568
      plugins/core/translations/coreplugin_fr.ts
  22. 58
      plugins/cvsplugin/translations/cvsplugin_fr.ts
  23. 4
      plugins/empty/translations/empty_fr.ts
  24. 72
      plugins/generix/translations/generix_en.ts
  25. 323
      plugins/generix/translations/generix_fr.ts
  26. 109
      plugins/services/translations/services_fr.ts
  27. 5
      plugins/svnplugin/translations/svnplugin_en.ts
  28. 79
      plugins/svnplugin/translations/svnplugin_fr.ts
  29. 12
      plugins/svnpluginwrapper/translations/svnpluginwrapper_fr.ts
  30. 22
      xinx/translations/xinx_fr.ts

3
CMakeLists.txt

@ -2,6 +2,8 @@ project(xinx-project)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")
cmake_minimum_required(VERSION 2.8.0)
add_custom_target(translation)
add_subdirectory(ext/ideality/lib)
add_subdirectory(ext/qcodeedit/lib)
add_subdirectory(components)
@ -24,4 +26,3 @@ find_package(Doxygen)
if (DOXYGEN_FOUND)
add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
endif(DOXYGEN_FOUND)

1408
Doxyfile

File diff suppressed because it is too large Load Diff

27
cmake_modules/UseXinx.cmake

@ -107,13 +107,11 @@ macro(initialisation_xinx cible)
file(GLOB_RECURSE resources *.qrc)
file(GLOB_RECURSE other_translations *.ts)
if(${GENERATE_TRANSLATION})
set(translations)
foreach(language ${LANGUAGES})
set(translations ${translations} "translations/${cible}_${language}.ts")
endforeach(language ${LANGUAGES})
list(REMOVE_ITEM other_translations ${translations})
endif()
set(translations)
foreach(language ${LANGUAGES})
set(translations ${translations} "translations/${cible}_${language}.ts")
endforeach(language ${LANGUAGES})
list(REMOVE_ITEM other_translations ${translations})
if(WIN32)
file(GLOB_RECURSE winresources *.rc)
@ -128,16 +126,17 @@ macro(initialisation_xinx cible)
xinx_automoc(moc_headers ${headers} OPTIONS ${MOC_FRAMEWORK})
qt4_add_resources(generated_resources ${resources})
if(${GENERATE_TRANSLATION})
qt4_create_translation(translations_qm ${forms} ${headers} ${sources} ${translations})
endif()
qt4_create_translation(translations_qm ${forms} ${headers} ${sources} ${translations})
qt4_add_translation(other_translations_qm ${other_translations})
add_custom_target(translation_${cible} DEPENDS ${translations_qm} ${other_translations_qm})
add_dependencies(translation translation_${cible})
endmacro(initialisation_xinx)
macro(add_xinx_executable cible librairies)
initialisation_xinx(${cible})
add_executable(${cible} WIN32 ${moc_headers} ${sources} ${winresources} ${generated_forms} ${generated_resources} ${translations_qm} ${other_translations_qm})
add_executable(${cible} WIN32 ${moc_headers} ${sources} ${winresources} ${generated_forms} ${generated_resources})
target_link_libraries(${cible} ${librairies} ${LIBRARIES} ${QT_LIBRARIES})
install(TARGETS ${cible} DESTINATION bin)
@ -151,7 +150,7 @@ macro(add_xinx_librairie cible librairies version)
# set_target_properties(xinxcmp PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import,--no-undefined,--enable-runtime-pseudo-reloc")
# endif(MINGW)
#endif(WIN32)
add_library(${cible} SHARED ${moc_headers} ${sources} ${winresources} ${generated_forms} ${generated_resources} ${translations_qm} ${other_translations_qm} )
add_library(${cible} SHARED ${moc_headers} ${sources} ${winresources} ${generated_forms} ${generated_resources} )
target_link_libraries(${cible} ${librairies} ${LIBRARIES} ${QT_LIBRARIES})
set_target_properties(${cible} PROPERTIES VERSION ${version})
if(UNIX)
@ -168,12 +167,12 @@ macro(add_xinx_plugins cible is_shared librairies version)
initialisation_xinx(${cible})
if(${IS_SHARED})
add_library(${cible} MODULE ${moc_headers} ${sources} ${winresources} ${generated_forms} ${generated_resources} ${translations_qm} ${other_translations_qm} )
add_library(${cible} MODULE ${moc_headers} ${sources} ${winresources} ${generated_forms} ${generated_resources} )
else()
if(CMAKE_SIZEOF_VOID_P MATCHES 8)
add_definitions(-fPIC)
endif()
add_library(${cible} STATIC ${moc_headers} ${sources} ${winresources} ${winresources}${generated_forms} ${generated_resources} ${translations_qm} ${other_translations_qm} )
add_library(${cible} STATIC ${moc_headers} ${sources} ${winresources} ${winresources}${generated_forms} ${generated_resources})
endif()
target_link_libraries(${cible} ${librairies} ${LIBRARIES} ${QT_LIBRARIES})

2
components/translations/xinxcmp_en.ts

@ -92,7 +92,7 @@
</message>
</context>
<context>
<name>QObject</name>
<name>XinxColorCombo</name>
<message>
<location filename="../xinxcolorcombo.cpp" line="59"/>
<source>None</source>

89
components/translations/xinxcmp_fr.ts

@ -6,62 +6,62 @@
<message>
<location filename="../ui/customscheme.ui" line="13"/>
<source>Form</source>
<translation>Formulaire</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/customscheme.ui" line="40"/>
<source>&amp;Format</source>
<translation>&amp;Format</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/customscheme.ui" line="46"/>
<source>&amp;Bold</source>
<translation>&amp;Gras</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/customscheme.ui" line="53"/>
<source>&amp;Overline</source>
<translation>&amp;Surligner</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/customscheme.ui" line="60"/>
<source>&amp;Strikeout</source>
<translation>&amp;Barré</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/customscheme.ui" line="67"/>
<source>&amp;Italic</source>
<translation>&amp;Italique</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/customscheme.ui" line="74"/>
<source>&amp;Underline</source>
<translation>S&amp;ouligné</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/customscheme.ui" line="84"/>
<source>&amp;WaveUnderline</source>
<translation>Souligné en &amp;vague</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/customscheme.ui" line="100"/>
<source>&amp;Color</source>
<translation>&amp;Couleur</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/customscheme.ui" line="106"/>
<source>&amp;Foreground</source>
<translation>&amp;Texte</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/customscheme.ui" line="119"/>
<source>&amp;Background</source>
<translation>Arrière &amp;plan</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/customscheme.ui" line="135"/>
<source>&amp;Example</source>
<translation>&amp;Exemple</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -69,13 +69,13 @@
<message>
<location filename="../directoryedit.cpp" line="399"/>
<source>Change the path</source>
<translation>Changer le dossier</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../directoryedit.cpp" line="401"/>
<location filename="../directoryedit.cpp" line="403"/>
<source>Change the file</source>
<translation>Changer le fichier</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -83,12 +83,12 @@
<message>
<location filename="../pluginselector.cpp" line="329"/>
<source>About ...</source>
<translation>A propos de ...</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../pluginselector.cpp" line="341"/>
<source>Configure ...</source>
<translation>Personnaliser ...</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -96,99 +96,92 @@
<message>
<location filename="../xinxcolorcombo.cpp" line="59"/>
<source>None</source>
<translation>Aucune</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="61"/>
<source>Red</source>
<translation>Rouge</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="63"/>
<source>Green</source>
<translation>Vert</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="65"/>
<source>Blue</source>
<translation>Bleu</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="67"/>
<source>Cyan</source>
<translation>Bleu ciel</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="69"/>
<source>Magenta</source>
<translation>Magenta</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="71"/>
<source>Yellow</source>
<translation>Jaune</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="73"/>
<source>Dark Red</source>
<translation>Rouge foncé</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="75"/>
<source>Dark Green</source>
<translation>Vert foncé</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="77"/>
<source>Dark Blue</source>
<translation>Bleu foncé</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="79"/>
<source>Dark Cyan</source>
<translation>Bleu ciel foncé</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="81"/>
<source>Dark Magenta</source>
<translation>Magenta foncé</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="83"/>
<source>Dark Yellow</source>
<translation>Jaune foncé</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="85"/>
<source>White</source>
<translation>Blanc</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="87"/>
<source>Light Gray</source>
<translation>Gris clair</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="89"/>
<source>Gray</source>
<translation>Gris</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="91"/>
<source>Dark Gray</source>
<translation>Gris foncé</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../xinxcolorcombo.cpp" line="93"/>
<source>Black</source>
<translation>Noir</translation>
</message>
</context>
<context>
<name>XinxColorCombo</name>
<message>
<source>Custom...</source>
<translation type="obsolete">Personnaliser ...</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -196,7 +189,7 @@
<message>
<location filename="../xinxcolorcombo.cpp" line="184"/>
<source>Custom...</source>
<translation>Personnaliser ...</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -204,7 +197,7 @@
<message>
<location filename="../xinxdirectorylistwidget.cpp" line="59"/>
<source>Get a directory</source>
<translation>Choisir un dossier</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -212,27 +205,27 @@
<message>
<location filename="../ui/xinxlistwidget.ui" line="40"/>
<source>&amp;Add</source>
<translation>&amp;Ajouter</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/xinxlistwidget.ui" line="51"/>
<source>&amp;Remove</source>
<translation>&amp;Supprimer</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/xinxlistwidget.ui" line="62"/>
<source>&amp;Default</source>
<translation>&amp;Défaut</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/xinxlistwidget.ui" line="86"/>
<source>Move &amp;Up</source>
<translation>Déplacer en &amp;haut</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/xinxlistwidget.ui" line="97"/>
<source>Move &amp;Down</source>
<translation>Déplacer en &amp;bas</translation>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

52485
doc/qt-doc.tag

File diff suppressed because it is too large Load Diff

22
framework/application/aboutdialogimpl.cpp

@ -26,8 +26,26 @@
/* AboutDialogImpl */
AboutDialogImpl::AboutDialogImpl(QWidget * parent, Qt::WFlags f)
: QDialog(parent, f)
/*!
* \class AboutDialogImpl
* \brief Implementation of about dialog containts informations as the version, the licence,
* the logo, and authors.
*
* The implementation containts only a constructor who defines default dialog
* presentation : Windows Style Dialog.
*
* \intern
*/
/*!
* \brief Constructor of The about dialog implementation.
*
* We defines a default windows flags. The windows can be resize.
*
* \param parent The parent of the dialog
* \param f Flags to use on Windows. By default, the dialog have a fixed size.
*/
AboutDialogImpl::AboutDialogImpl(QWidget * parent, Qt::WFlags f) : QDialog(parent, f)
{
setupUi(this);

12
framework/application/aboutdialogimpl.h

@ -24,22 +24,10 @@
// Xinx header
#include "ui_about.h"
/*!
* Implementation of about dialog containts informations as the version, the licence,
* the logo, and authors.
* The implementation containts only a constructor who defines default dialog
* presentation : Windows Style Dialog.
*/
class AboutDialogImpl : public QDialog, public Ui::AboutDialog
{
Q_OBJECT
public:
/*!
* Constructor of The about dialog implementation. We defines a default windows flags.
* The windows can be resize.
* \param parent The parent of the dialog
* \param f Flags to use on Windows. By default, the dialog have a fixed size.
*/
AboutDialogImpl(QWidget * parent = 0, Qt::WFlags f = Qt::MSWindowsFixedSizeDialogHint);
private slots:
};

103
framework/application/customdialog/customdialogimpl.cpp

@ -19,6 +19,7 @@
// Xinx header
#include "customdialogimpl.h"
#include "customdialogimpl_p.h"
#include "customgeneralimpl.h"
#include "customprojectimpl.h"
@ -36,6 +37,43 @@
#include <QTimer>
#include <QDebug>
/* CustomDialogImplPrivate */
CustomDialogImplPrivate::CustomDialogImplPrivate(QObject* parent) : _ui(new Ui::CustomDialog)
{
}
CustomDialogImplPrivate::~CustomDialogImplPrivate()
{
}
/*!
* \brief Update the state of the Ok button.
*
* This method is called automatically every 250ms. This method check IXinxPluginConfigurationPage::isSettingsValid()
* on each page and show a red message if settings isn't valid.
*/
void CustomDialogImplPrivate::updateOkButton()
{
_ui->m_errorLabel->setVisible(false);
foreach(IXinxPluginConfigurationPage * page, _pages)
{
QString message;
if (! page->isSettingsValid(message))
{
_ui->m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
if (!message.isEmpty())
{
_ui->m_errorLabel->setVisible(true);
_ui->m_errorLabel->setText(QString("<img src=\":/images/error16.png\"/> ") + tr("%1 on page \"%2\"").arg(message).arg(page->name()));
}
return;
}
}
_ui->m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
}
/* CustomDialogImpl */
/*!
@ -50,7 +88,7 @@
* This dialog use the interface IXinxPluginConfigurationPage to permit to plugin to extend the dialog with pages.
*
*
* This dialog mustn't be used directl by plugins. Only framework can use it.
* This dialog mustn't be used directly by plugins. Only framework can use it.
*/
/*!
@ -60,20 +98,20 @@
* \param parent Parent of the dialog
* \param f Flags to use on Windows. By default, the dialog have a fixed size.
*/
CustomDialogImpl::CustomDialogImpl(QWidget * parent, Qt::WFlags f) : QDialog(parent, f)
CustomDialogImpl::CustomDialogImpl(QWidget * parent, Qt::WFlags f) : QDialog(parent, f), d(new CustomDialogImplPrivate)
{
setupUi(this);
m_errorLabel->setVisible(false);
d->_ui->setupUi(this);
d->_ui->m_errorLabel->setVisible(false);
delete pageToDelete;
m_pages << new CustomGeneralImpl(this);
m_pages << new CustomProjectImpl(this);
m_pages << new CustomEditorImpl(this);
m_pages << new CustomFontImpl(this);
m_pages << new CustomSyntaxImpl(this);
m_pages << new CustomSnipetImpl(this);
m_pages << new CustomToolsImpl(this);
d->_pages << new CustomGeneralImpl(this);
d->_pages << new CustomProjectImpl(this);
d->_pages << new CustomEditorImpl(this);
d->_pages << new CustomFontImpl(this);
d->_pages << new CustomSyntaxImpl(this);
d->_pages << new CustomSnipetImpl(this);
d->_pages << new CustomToolsImpl(this);
foreach(XinxPluginElement * plugin, XinxPluginsLoader::self()->plugins())
{
@ -83,17 +121,17 @@ CustomDialogImpl::CustomDialogImpl(QWidget * parent, Qt::WFlags f) : QDialog(pa
if (! p) continue;
QList<IXinxPluginConfigurationPage*> pages = p->createSettingsDialog(this);
m_pages << pages;
d->_pages << pages;
foreach(IXinxPluginConfigurationPage * page, pages)
{
m_pluginsPages.insertMulti(e, page);
d->_pluginsPages.insertMulti(e, page);
}
}
m_pages << new CustomModulesImpl(this);
d->_pages << new CustomModulesImpl(this);
foreach(IXinxPluginConfigurationPage * page, m_pages)
foreach(IXinxPluginConfigurationPage * page, d->_pages)
{
QListWidgetItem * item = new QListWidgetItem(QIcon(page->image()), page->name());
m_listWidget->addItem(item);
@ -104,7 +142,7 @@ CustomDialogImpl::CustomDialogImpl(QWidget * parent, Qt::WFlags f) : QDialog(pa
QTimer * updateOkTimer = new QTimer(this);
updateOkTimer->setInterval(250);
updateOkTimer->setSingleShot(false);
connect(updateOkTimer, SIGNAL(timeout()), SLOT(updateOkButton()));
connect(updateOkTimer, SIGNAL(timeout()), d.data(), SLOT(updateOkButton()));
updateOkTimer->start();
}
@ -112,13 +150,13 @@ CustomDialogImpl::CustomDialogImpl(QWidget * parent, Qt::WFlags f) : QDialog(pa
//! Destroy the custom dialog
CustomDialogImpl::~CustomDialogImpl()
{
qDeleteAll(m_pages);
qDeleteAll(d->_pages);
}
//! Call method IXinxPluginConfigurationPage::loadSettingsDialog() on each page
void CustomDialogImpl::loadConfig()
{
foreach(IXinxPluginConfigurationPage * page, m_pages)
foreach(IXinxPluginConfigurationPage * page, d->_pages)
{
page->loadSettingsDialog();
}
@ -127,39 +165,12 @@ void CustomDialogImpl::loadConfig()
//! Call method IXinxPluginConfigurationPage::saveSettingsDialog() on each page
void CustomDialogImpl::saveConfig()
{
foreach(IXinxPluginConfigurationPage * page, m_pages)
foreach(IXinxPluginConfigurationPage * page, d->_pages)
{
page->saveSettingsDialog();
}
}
/*!
* \brief Update the state of the Ok button.
*
* This method is called automatically every 250ms. This method check IXinxPluginConfigurationPage::isSettingsValid()
* on each page and show a red message if settings isn't valid.
*/
void CustomDialogImpl::updateOkButton()
{
m_errorLabel->setVisible(false);
foreach(IXinxPluginConfigurationPage * page, m_pages)
{
QString message;
if (! page->isSettingsValid(message))
{
m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
if (!message.isEmpty())
{
m_errorLabel->setVisible(true);
m_errorLabel->setText(QString("<img src=\":/images/error16.png\"/> ") + tr("%1 on page \"%2\"").arg(message).arg(page->name()));
}
return;
}
}
m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
}
/*!
* \brief Called when the user accept the content of the dialog.
*

7
framework/application/customdialog/customdialogimpl.h

@ -25,6 +25,7 @@
#include "ui_customdialog.h"
#include <core/xinxconfig.h>
class CustomDialogImplPrivate;
class PluginElement;
class RecursiveSortFilterProxyModel;
class IXinxPluginConfigurationPage;
@ -40,12 +41,8 @@ public:
void saveConfig();
public slots:
virtual void accept();
private slots:
void updateOkButton();
private:
QMultiHash<PluginElement*,IXinxPluginConfigurationPage*> m_pluginsPages;
QList<IXinxPluginConfigurationPage*> m_pages;
QScopedPointer<CustomDialogImplPrivate> d;
};
#endif

4
framework/application/customdialog/ui/customdialog.ui

@ -111,8 +111,8 @@ background-color: rgb(222, 130, 130);</string>
<tabstop>m_listWidget</tabstop>
</tabstops>
<resources>
<include location="../../../components/xinxpluginselector.qrc"/>
<include location="../../application.qrc"/>
<include location="../../../../components/xinxpluginselector.qrc"/>
<include location="../../../../xinx/application.qrc"/>
</resources>
<connections>
<connection>

7
framework/project/xinxprojectproject.cpp

@ -51,6 +51,7 @@ namespace XinxProject
class PrivateXinxProject
{
Q_DECLARE_TR_FUNCTIONS(PrivateXinxProject)
public:
PrivateXinxProject();
~PrivateXinxProject();
@ -65,7 +66,6 @@ public:
void loadFromFile();
void saveToFile();
QString tr(const char* arg1);
int m_version;
@ -106,11 +106,6 @@ void PrivateXinxProject::initialisation()
_resolver = new ExternalFileResolver(m_self);
}
QString PrivateXinxProject::tr(const char* arg1)
{
return Project::tr(arg1);
}
QString PrivateXinxProject::getValue(const QDomDocument & document, const QString & node)
{
QDomElement root = document.documentElement();

244
framework/translations/framework_en.ts

@ -512,23 +512,23 @@ Only checked files are commited.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customeditor.ui" line="151"/>
<source>on right &amp;corner</source>
<location filename="../application/customdialog/ui/customeditor.ui" line="148"/>
<source>&lt;p&gt;&lt;img src=&quot;:/images/fileclose.png&quot;/&gt;Show a close button on each tab.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customeditor.ui" line="164"/>
<source>on the right corner &amp;and on the tab</source>
<location filename="../application/customdialog/ui/customeditor.ui" line="151"/>
<source>on right &amp;corner</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customeditor.ui" line="148"/>
<source>&lt;p&gt;&lt;img src=&quot;:/images/fileclose.png&quot;/&gt;Show a close button on each tab.&lt;/p&gt;</source>
<location filename="../application/customdialog/ui/customeditor.ui" line="161"/>
<source>&lt;p&gt;&lt;img src=&quot;:/images/tabclose.png&quot; /&gt;&lt;img src=&quot;:/images/fileclose.png&quot; /&gt;Show a button on the right corner of &lt;b&gt;XINX&lt;/b&gt; and another on each tab. This option is the concatenation of the two other options&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customeditor.ui" line="161"/>
<source>&lt;p&gt;&lt;img src=&quot;:/images/tabclose.png&quot; /&gt;&lt;img src=&quot;:/images/fileclose.png&quot; /&gt;Show a button on the right corner of &lt;b&gt;XINX&lt;/b&gt; and another on each tab. This option is the concatenation of the two other options&lt;/p&gt;</source>
<location filename="../application/customdialog/ui/customeditor.ui" line="164"/>
<source>on the right corner &amp;and on the tab</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -627,112 +627,22 @@ Only checked files are commited.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="89"/>
<source>Custom...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="94"/>
<source>Red</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="99"/>
<source>Green</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="104"/>
<source>Blue</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="109"/>
<source>Cyan</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="114"/>
<source>Magenta</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="119"/>
<source>Yellow</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="124"/>
<source>Dark Red</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="129"/>
<source>Dark Green</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="134"/>
<source>Dark Blue</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="139"/>
<source>Dark Cyan</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="144"/>
<source>Dark Magenta</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="149"/>
<source>Dark Yellow</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="154"/>
<source>White</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="159"/>
<source>Light Gray</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="164"/>
<source>Gray</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="169"/>
<source>Dark Gray</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="174"/>
<source>Black</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="182"/>
<location filename="../application/customdialog/ui/customfont.ui" line="92"/>
<source>Show tabulation and space in the editor with specialcharacter (in greyed colour).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="185"/>
<location filename="../application/customdialog/ui/customfont.ui" line="95"/>
<source>Show &amp;tabulation and space in the editor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="192"/>
<location filename="../application/customdialog/ui/customfont.ui" line="102"/>
<source>Size of a &amp;tabulation :</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/customdialog/ui/customfont.ui" line="202"/>
<location filename="../application/customdialog/ui/customfont.ui" line="112"/>
<source>Size of tabulation in number of character. This is the number of character that tabulation replaces.</source>
<translation type="unfinished"></translation>
</message>
@ -1694,31 +1604,6 @@ Do you really want refresh this?</source>
&lt;p&gt;&lt;i&gt;Modification take effect at restart.&lt;/i&gt;&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="142"/>
<source>&amp;Open the last session at start</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="162"/>
<source>&lt;p&gt;This the path where the save dialog must be opened when you create a new project.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="189"/>
<source>Editor Settings Page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="192"/>
<source>In this page we adjust settings used by the editor. In this page we can adjust effect, used to facilitate the edition (has show the current line, space, tabulation).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="306"/>
<source>We have now customize XINX. You can adjuste XINX settings by opening the good &quot;Customize dialog&quot;. In the tools menu.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="132"/>
<source>Auto refresh directory dock</source>
@ -1729,11 +1614,21 @@ Do you really want refresh this?</source>
<source>Open the last opened project (&lt;i&gt;if any, it&apos;s the opened project when &lt;b&gt;XINX&lt;/b&gt; is closed&lt;/i&gt;), when &lt;b&gt;XINX&lt;/b&gt; is started.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="142"/>
<source>&amp;Open the last session at start</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="149"/>
<source>Default open &amp;project directory :</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="162"/>
<source>&lt;p&gt;This the path where the save dialog must be opened when you create a new project.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="169"/>
<source>&lt;p&gt;Choose the default text encoding, when the text encoding can&apos;t be found.
@ -1746,6 +1641,16 @@ Do you really want refresh this?</source>
<source>Default text &amp;encoding :</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="189"/>
<source>Editor Settings Page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="192"/>
<source>In this page we adjust settings used by the editor. In this page we can adjust effect, used to facilitate the edition (has show the current line, space, tabulation).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="198"/>
<source>&lt;p&gt;Alert user when the file is modified by an extern application. The user has the choice to open the new file (&lt;u&gt;and loose his change&lt;/u&gt;) or keep current file.&lt;/p&gt;</source>
@ -1814,6 +1719,11 @@ Do you really want refresh this?</source>
<source>Conclusion</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="306"/>
<source>We have now customize XINX. You can adjuste XINX settings by opening the good &quot;Customize dialog&quot;. In the tools menu.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../application/newversion.ui" line="316"/>
<source>Have fun with XINX.</source>
@ -1841,7 +1751,7 @@ Do you really want refresh this?</source>
<context>
<name>ParserFactory</name>
<message>
<location filename="../contentview3/parserfactory.cpp" line="66"/>
<location filename="../contentview3/parserfactory.cpp" line="65"/>
<source>Ambigous parser for file %1</source>
<translation type="unfinished"></translation>
</message>
@ -2153,6 +2063,42 @@ Do you really want refresh this?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PrivateXinxProject</name>
<message>
<location filename="../project/xinxprojectproject.cpp" line="183"/>
<source>Cannot read file %1:
%2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../project/xinxprojectproject.cpp" line="190"/>
<source>Parse error at line %1, column %2:
%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../project/xinxprojectproject.cpp" line="196"/>
<source>The file isn&apos;t a XINX Project. The root name must be &quot;XinxProject&quot;, not &quot;%1&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../project/xinxprojectproject.cpp" line="200"/>
<source>The file is a too recent XINX Project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../project/xinxprojectproject.cpp" line="202"/>
<source>The project can&apos;t be opened. Please use the XINX Project Wizard.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../project/xinxprojectproject.cpp" line="273"/>
<source>Cannot write file %1:
%2.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ProgressWizardPage</name>
<message>
@ -3078,13 +3024,13 @@ A project can define web services too.</source>
<location filename="translationmanager.cpp" line="58"/>
<source>C</source>
<comment>Translate this word in the name of your lang (ie: English, Français, ...)</comment>
<translation>English</translation>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="translationmanager.cpp" line="59"/>
<source>:/images/unknown.png</source>
<comment>Give the image that contains the flag of your lang</comment>
<translation>:/images/usa.png</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -3485,46 +3431,10 @@ This wizard will convert the project to the last version of XINX. Wizard must co
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>XinxProject::PrivateXinxProject</name>
<message>
<location filename="../project/xinxprojectproject.cpp" line="188"/>
<source>Cannot read file %1:
%2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../project/xinxprojectproject.cpp" line="195"/>
<source>Parse error at line %1, column %2:
%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../project/xinxprojectproject.cpp" line="201"/>
<source>The file isn&apos;t a XINX Project. The root name must be &quot;XinxProject&quot;, not &quot;%1&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../project/xinxprojectproject.cpp" line="205"/>
<source>The file is a too recent XINX Project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../project/xinxprojectproject.cpp" line="207"/>
<source>The project can&apos;t be opened. Please use the XINX Project Wizard.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../project/xinxprojectproject.cpp" line="278"/>
<source>Cannot write file %1:
%2.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>XinxProject::Project</name>
<message>
<location filename="../project/xinxprojectproject.cpp" line="314"/>
<location filename="../project/xinxprojectproject.cpp" line="309"/>
<source>The project must be created in a existing directory</source>
<translation type="unfinished"></translation>
</message>

1817
framework/translations/framework_fr.ts

File diff suppressed because it is too large Load Diff

8
plugins/core/actions/validationaction.cpp

@ -19,6 +19,7 @@
// Xinx header
#include "validationaction.h"
#include "validationaction_p.h"
#include <editors/editormanager.h>
#include <editors/textfileeditor.h>
#include "editors/widgeteditor/xml/xmltexteditor.h"
@ -31,13 +32,6 @@
/* MessageHandler */
class MessageHandler : public QAbstractMessageHandler
{
public:
virtual void handleMessage(QtMsgType type, const QString & description, const QUrl & identifier, const QSourceLocation & sourceLocation);
};
void MessageHandler::handleMessage(QtMsgType type, const QString & description, const QUrl & identifier, const QSourceLocation & sourceLocation)
{
Q_UNUSED(identifier);

3
plugins/core/actions/validationaction.h

@ -24,9 +24,6 @@
// Xinx header
#include <actions/actioninterface.h>
// Qt header
#include <QAbstractMessageHandler>
class XmlPresentationDockWidget;
class ValidationAction : public XinxAction::Action

35
plugins/core/actions/validationaction_p.h

@ -0,0 +1,35 @@
/* *********************************************************************** *
* XINX *
* Copyright (C) 2006-2010 by Ulrich Van Den Hekke *
* ulrich.vdh@shadoware.org *
* *
* 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 *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
* *********************************************************************** */
#pragma once
#ifndef VALIDATIONACTION_P_H
#define VALIDATIONACTION_P_H
// Qt header
#include <QAbstractMessageHandler>
class MessageHandler : public QAbstractMessageHandler
{
Q_OBJECT
public:
virtual void handleMessage(QtMsgType type, const QString & description, const QUrl & identifier, const QSourceLocation & sourceLocation);
};
#endif // VALIDATIONACTION_P_H

125
plugins/core/docks/datastream/xquerydialogimpl.cpp

@ -19,6 +19,7 @@
// Xinx header
#include "xquerydialogimpl.h"
#include "xquerydialogimpl_p.h"
#include <plugins/xinxpluginsloader.h>
#include "editors/models/xq/xqmodelcompleter.h"
@ -34,77 +35,75 @@
/* XQueryDialogMessageHandler */
class XQueryDialogMessageHandler : public QAbstractMessageHandler
XQueryDialogMessageHandler::XQueryDialogMessageHandler(QObject * parent) : QAbstractMessageHandler(parent)
{
public:
XQueryDialogMessageHandler(QObject * parent = 0) : QAbstractMessageHandler(parent) { }
virtual ~XQueryDialogMessageHandler() { }
}
XQueryDialogMessageHandler::~XQueryDialogMessageHandler() {
}
const QStringList & XQueryDialogMessageHandler::messages() const
{
return m_messages;
}
const QStringList & messages() const
void XQueryDialogMessageHandler::handleMessage(QtMsgType type, const QString & description, const QUrl & identifier, const QSourceLocation & sourceLocation)
{
const bool hasLine = sourceLocation.line() != -1;
switch (type)
{