fix(build): correction of build system after update of cmake

master
Ulrich Van Den Hekke 2016-07-26 17:48:48 +02:00
parent e749e56f32
commit fe7bf54fa1
51 changed files with 3811 additions and 2772 deletions

2703
Doxyfile

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
set(LANGUAGES fr en)
set(LANGUAGES fr en bg)
set(CMAKE_C_FLAGS "-frtti -fexceptions -Wall")
set(CMAKE_CXX_FLAGS "-frtti -fexceptions -Wall") # -Wold-style-cast") # -Woverloaded-virtual")
@ -29,27 +29,6 @@ if(MINGW)
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -O coff -o <OBJECT> <SOURCE>")
endif(MINGW)
macro(xinx_automoc outfiles)
qt4_get_moc_flags(moc_flags)
qt4_extract_options(moc_files moc_options ${ARGN})
foreach (it ${moc_files})
get_filename_component(it ${it} ABSOLUTE)
if ( EXISTS ${it} )
file(READ ${it} _contents)
string(REGEX MATCHALL "Q_OBJECT" _match "${_contents}")
if(_match)
qt4_make_output_file(${it} moc_ cxx outfile)
qt4_create_moc_command(${it} ${outfile} "${moc_flags}" "${moc_options}")
macro_add_file_dependencies(${it} ${outfile})
set(${outfiles} ${${outfiles}} ${outfile})
endif(_match)
endif ( EXISTS ${it} )
endforeach(it)
endmacro(xinx_automoc)
macro(initialisation_xinx cible)
unset(LIBRARIES)
@ -104,38 +83,37 @@ macro(initialisation_xinx cible)
file(GLOB_RECURSE sources *.cpp ${UNIQUE_APPPLICATION_SOURCES} ${SOAP_SOURCES})
file(GLOB_RECURSE forms *.ui)
file(GLOB_RECURSE resources *.qrc)
file(GLOB_RECURSE other_translations *.ts)
set(translations)
foreach(language ${LANGUAGES})
set(translations ${translations} "translations/${cible}_${language}.ts")
endforeach(language ${LANGUAGES})
list(REMOVE_ITEM other_translations ${translations})
file(GLOB_RECURSE other_translations RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.ts)
option (UPDATE_TRANSLATIONS "Update source translation translations/*.ts")
if (UPDATE_TRANSLATIONS)
set(translations)
foreach(language ${LANGUAGES})
set(translations ${translations} "translations/${cible}_${language}.ts")
endforeach(language ${LANGUAGES})
list(REMOVE_ITEM other_translations ${translations})
endif (UPDATE_TRANSLATIONS)
if(WIN32)
file(GLOB_RECURSE winresources *.rc)
endif(WIN32)
set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM true)
#set_source_files_properties(${translations} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/translations")
set_source_files_properties(${translations} PROPERTIES OUTPUT_LOCATION "${CMAKE_BINARY_DIR}/i18n")
set_source_files_properties(${other_translations} PROPERTIES OUTPUT_LOCATION "${CMAKE_BINARY_DIR}/i18n")
qt4_wrap_ui(generated_forms ${forms})
xinx_automoc(moc_headers ${headers} OPTIONS ${MOC_FRAMEWORK})
qt4_add_resources(generated_resources ${resources})
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})
add_executable(${cible} WIN32 ${sources} ${winresources} ${generated_forms} ${generated_resources} ${translations_qm} ${other_translations_qm})
target_link_libraries(${cible} ${librairies} ${LIBRARIES} ${QT_LIBRARIES})
install(TARGETS ${cible} DESTINATION bin)
@ -149,7 +127,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} )
add_library(${cible} SHARED ${sources} ${winresources} ${generated_forms} ${generated_resources} ${translations_qm} ${other_translations_qm})
target_link_libraries(${cible} ${librairies} ${LIBRARIES} ${QT_LIBRARIES})
set_target_properties(${cible} PROPERTIES VERSION ${version})
if(UNIX)
@ -166,13 +144,13 @@ 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} )
add_library(${cible} MODULE ${sources} ${winresources} ${generated_forms} ${generated_resources} ${translations_qm} ${other_translations_qm})
install(TARGETS ${cible} DESTINATION plugins)
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})
add_library(${cible} STATIC ${sources} ${winresources} ${winresources}${generated_forms} ${generated_resources})
endif()
target_link_libraries(${cible} ${librairies} ${LIBRARIES} ${QT_LIBRARIES})

View File

@ -1,3 +1,6 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(Qt4 REQUIRED)
find_package(QCodeEdit REQUIRED)

View File

@ -18,7 +18,7 @@
*/
// Xinx header
#include "p_pluginselector.h"
#include "pluginselector_p.h"
#include "pluginelement.h"
// Qt header

View File

@ -67,13 +67,13 @@
<context>
<name>DirectoryEdit</name>
<message>
<location filename="../directoryedit.cpp" line="388"/>
<location filename="../directoryedit.cpp" line="399"/>
<source>Change the path</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../directoryedit.cpp" line="390"/>
<location filename="../directoryedit.cpp" line="392"/>
<location filename="../directoryedit.cpp" line="401"/>
<location filename="../directoryedit.cpp" line="403"/>
<source>Change the file</source>
<translation type="unfinished"></translation>
</message>
@ -92,7 +92,7 @@
</message>
</context>
<context>
<name>QObject</name>
<name>XinxColorCombo</name>
<message>
<location filename="../xinxcolorcombo.cpp" line="59"/>
<source>None</source>
@ -195,7 +195,7 @@
<context>
<name>XinxDirectoryListWidget</name>
<message>
<location filename="../xinxdirectorylistwidget.cpp" line="37"/>
<location filename="../xinxdirectorylistwidget.cpp" line="59"/>
<source>Get a directory</source>
<translation type="unfinished"></translation>
</message>

View File

@ -1 +1 @@
usr/plugins/libcvsplugin.so /usr/lib/xinx/plugins/
usr/plugins/libcvsplugin.so* /usr/lib/xinx/plugins/

View File

@ -1 +1 @@
usr/plugins/libgenerix.so /usr/lib/xinx/plugins/
usr/plugins/libgenerix.so* /usr/lib/xinx/plugins/

View File

@ -1 +1 @@
usr/plugins/libservices.so /usr/lib/xinx/plugins/
usr/plugins/libservices.so* /usr/lib/xinx/plugins/

View File

@ -1 +1 @@
usr/plugins/libsvnplugin.so /usr/lib/xinx/plugins/
usr/plugins/libsvnplugin.so* /usr/lib/xinx/plugins/

1
debian/xinx.install vendored
View File

@ -8,3 +8,4 @@ usr/i18n/*.qm /usr/share/xinx/i18n/
usr/scripts/*.js /usr/share/xinx/scripts/
usr/scripts/*.xq /usr/share/xinx/scripts/
usr/datas/*.xml /usr/share/xinx/datas/
usr/templates/*.xml /usr/share/xinx/templates/

View File

@ -1,3 +1,6 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(Qt4 REQUIRED)
include(UseXinx)
@ -29,10 +32,7 @@ set(sources
dstackedmainwindow.cpp
dworkspacemainwindow.cpp)
xinx_automoc(moc_headers ${headers})
qt4_automoc(${sources})
add_library(ideality SHARED ${moc_headers} ${sources})
add_library(ideality SHARED ${sources})
target_link_libraries(ideality ${QT_LIBRARIES})
set_target_properties(ideality PROPERTIES VERSION 0.1.0.0)
if(UNIX)

View File

@ -1,3 +1,6 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(Qt4 REQUIRED)
set(QT_USE_QTXML TRUE)
@ -84,9 +87,8 @@ set(forms
widgets/formatconfig.ui)
qt4_wrap_ui(generated_forms ${forms})
xinx_automoc(moc_headers ${headers})
add_library(qcodeedit SHARED ${moc_headers} ${sources} ${generated_forms})
add_library(qcodeedit SHARED ${sources} ${generated_forms})
target_link_libraries(qcodeedit ${QT_LIBRARIES})
set_target_properties(qcodeedit PROPERTIES VERSION 2.2.0.0)
if(UNIX)

View File

@ -65,6 +65,10 @@ class QtLocalPeer;
# define QT_QTSINGLEAPPLICATION_EXPORT
#endif
#pragma once
#ifndef __QTSINGLEAPPLICATION
#define __QTSINGLEAPPLICATION
class QT_QTSINGLEAPPLICATION_EXPORT QtSingleApplication : public QApplication
{
Q_OBJECT
@ -103,3 +107,5 @@ private:
QtLocalPeer *peer;
QWidget *actWin;
};
#endif // __QTSINGLEAPPLICATION

View File

@ -1,3 +1,6 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(Qt4 REQUIRED)
find_package(QCodeEdit REQUIRED)
find_package(Ideality REQUIRED)

View File

@ -61,7 +61,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../xinx/application.qrc">:/images/splash.png</pixmap>
<pixmap resource="../application.qrc">:/images/splash.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -71,8 +71,7 @@
<item>
<widget class="QLabel" name="m_aboutLabel">
<property name="text">
<string>&lt;p&gt;&lt;b&gt;XINX&lt;/b&gt; Is Not only XML&lt;/p&gt;
&lt;p&gt;(c) 2006-2011, Ulrich Van Den Hekke&lt;/p&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;XINX&lt;/span&gt; Is Not only XML&lt;/p&gt;&lt;p&gt;(c) 2006-2016, Ulrich Van Den Hekke&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@ -250,6 +249,7 @@
</widget>
<resources>
<include location="../../components/xinxpluginselector.qrc"/>
<include location="../application.qrc"/>
<include location="../../xinx/application.qrc"/>
</resources>
<connections>

View File

@ -25,7 +25,7 @@
// xinx header
#include "core/filewatcher.h"
#include "core/p_filewatcher.h"
#include "core/filewatcher_p.h"
/*! \cond private */

View File

@ -23,7 +23,7 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 10
#define VERSION_RELEASE 3
#define VERSION_RELEASE 4
#define VERSION_BUILD ${XINX_FRAMEWORK_HG_DATE_STR}
#define VERSION_CHANGESET "${XINX_FRAMEWORK_HG_CHANGESET}"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,6 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(Qt4 REQUIRED)
find_package(QCodeEdit REQUIRED)

View File

@ -1,3 +1,6 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(Qt4 REQUIRED)
set(USE_FRAMEWORK True)
set(USE_COMPONENTS True)

View File

@ -120,37 +120,37 @@
<context>
<name>RCS_CVS</name>
<message>
<location filename="../rcs_cvs.cpp" line="223"/>
<location filename="../rcs_cvs.cpp" line="224"/>
<source>Update terminated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="252"/>
<location filename="../rcs_cvs.cpp" line="253"/>
<source>Update to revision %1 terminated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="269"/>
<location filename="../rcs_cvs.cpp" line="270"/>
<source>Files commited :</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="283"/>
<location filename="../rcs_cvs.cpp" line="284"/>
<source>Commit terminated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="302"/>
<location filename="../rcs_cvs.cpp" line="303"/>
<source>Add terminated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="321"/>
<location filename="../rcs_cvs.cpp" line="322"/>
<source>Remove terminated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="339"/>
<location filename="../rcs_cvs.cpp" line="340"/>
<source>I&apos;M A PROCESS KILLER</source>
<translation type="unfinished"></translation>
</message>

View File

@ -120,37 +120,37 @@
<context>
<name>RCS_CVS</name>
<message>
<location filename="../rcs_cvs.cpp" line="223"/>
<location filename="../rcs_cvs.cpp" line="224"/>
<source>Update terminated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="252"/>
<location filename="../rcs_cvs.cpp" line="253"/>
<source>Update to revision %1 terminated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="269"/>
<location filename="../rcs_cvs.cpp" line="270"/>
<source>Files commited :</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="283"/>
<location filename="../rcs_cvs.cpp" line="284"/>
<source>Commit terminated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="302"/>
<location filename="../rcs_cvs.cpp" line="303"/>
<source>Add terminated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="321"/>
<location filename="../rcs_cvs.cpp" line="322"/>
<source>Remove terminated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="339"/>
<location filename="../rcs_cvs.cpp" line="340"/>
<source>I&apos;M A PROCESS KILLER</source>
<translation type="unfinished"></translation>
</message>

View File

@ -120,37 +120,37 @@
<context>
<name>RCS_CVS</name>
<message>
<location filename="../rcs_cvs.cpp" line="223"/>
<location filename="../rcs_cvs.cpp" line="224"/>
<source>Update terminated</source>
<translation>Mise à jour terminée</translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="252"/>
<location filename="../rcs_cvs.cpp" line="253"/>
<source>Update to revision %1 terminated</source>
<translation type="unfinished">Mise à jour à la révision %1 terminée</translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="269"/>
<location filename="../rcs_cvs.cpp" line="270"/>
<source>Files commited :</source>
<translation>Fichiers validés :</translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="283"/>
<location filename="../rcs_cvs.cpp" line="284"/>
<source>Commit terminated</source>
<translation>Validation terminée</translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="302"/>
<location filename="../rcs_cvs.cpp" line="303"/>
<source>Add terminated</source>
<translation>Ajout terminé</translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="321"/>
<location filename="../rcs_cvs.cpp" line="322"/>
<source>Remove terminated</source>
<translation type="unfinished">Suppression terminée</translation>
</message>
<message>
<location filename="../rcs_cvs.cpp" line="339"/>
<location filename="../rcs_cvs.cpp" line="340"/>
<source>I&apos;M A PROCESS KILLER</source>
<translation>Je suis un tueur d&apos;application</translation>
</message>

View File

@ -1,3 +1,6 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(Qt4 REQUIRED)
set(USE_FRAMEWORK True)

View File

@ -1,3 +1,6 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(Qt4 REQUIRED)
find_package(QCodeEdit REQUIRED)
find_package(LibXml2 REQUIRED)

View File

@ -1,6 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="bg_BG">
<context>
<name>AddModifyLabelDialog</name>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="17"/>
<source>Adding/Modify dictionary label</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="23"/>
<source>&amp;Code :</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="36"/>
<source>&amp;Langue</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="53"/>
<source>&amp;Description :</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="76"/>
<source>C&amp;ontext :</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AliasItem</name>
<message>
@ -122,26 +150,30 @@
<context>
<name>DictionaryDockWidget</name>
<message>
<location filename="../ui/dictionarydockwidget.ui" line="14"/>
<location filename="../docks/dictionary/dictionarydockwidget.ui" line="14"/>
<source>Dictionary</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/dictionarydockwidget.ui" line="32"/>
<location filename="../ui/dictionarydockwidget.ui" line="46"/>
<source>...</source>
<location filename="../docks/dictionary/dictionarydockwidget.ui" line="28"/>
<source>Add a new label</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DictionaryDockWidgetImpl</name>
<message>
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="30"/>
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="69"/>
<source>Dictionary</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="105"/>
<source>No label(s) loaded.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="43"/>
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="109"/>
<source>%n label(s) loaded.</source>
<translation type="unfinished">
<numerusform></numerusform>
@ -152,7 +184,17 @@
<context>
<name>DictionaryModel</name>
<message>
<location filename="../docks/dictionary/dictionarymodel.cpp" line="67"/>
<location filename="../docks/dictionary/dictionarymodel.cpp" line="104"/>
<source>Can&apos;t open the dictionary for write : %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/dictionarymodel.cpp" line="199"/>
<source>Can&apos;t parse the dictionary for write : %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/dictionarymodel.cpp" line="233"/>
<source>Please type a prefix to list labels.</source>
<translation type="unfinished"></translation>
</message>
@ -160,7 +202,7 @@
<context>
<name>Gce150FileResolver</name>
<message>
<location filename="../pluginresolver/gce150fileresolver.cpp" line="50"/>
<location filename="../pluginresolver/gce150fileresolver.cpp" line="51"/>
<source>GCE150 File Resolver</source>
<translation type="unfinished"></translation>
</message>
@ -189,17 +231,17 @@
<context>
<name>GcePropertiesParser</name>
<message>
<location filename="../configuration/gcepropertiesparser.cpp" line="67"/>
<location filename="../configuration/gcepropertiesparser.cpp" line="68"/>
<source>Can&apos;t open the gce properties file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../configuration/gcepropertiesparser.cpp" line="75"/>
<location filename="../configuration/gcepropertiesparser.cpp" line="76"/>
<source>Can&apos;t read the root element of the gce properties file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../configuration/gcepropertiesparser.cpp" line="84"/>
<location filename="../configuration/gcepropertiesparser.cpp" line="85"/>
<source>Unable to create new XPath context</source>
<translation type="unfinished"></translation>
</message>
@ -207,18 +249,18 @@
<context>
<name>Generix::Dictionary::Parser</name>
<message>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="77"/>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="78"/>
<source>The file is not an dictionary file.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="103"/>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="129"/>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="104"/>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="130"/>
<source>Labels node expected. %1 found</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="157"/>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="158"/>
<source>Label node expected. %1 found</source>
<translation type="unfinished"></translation>
</message>
@ -285,12 +327,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugindefinition/generix.cpp" line="110"/>
<location filename="../plugindefinition/generix.cpp" line="108"/>
<source>Plugin for Generix</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugindefinition/generix.cpp" line="112"/>
<location filename="../plugindefinition/generix.cpp" line="110"/>
<source>This plugin add some fonctionnality usefull for Generix Group&apos;s XINX users</source>
<translation type="unfinished"></translation>
</message>
@ -298,12 +340,12 @@
<context>
<name>GenerixProjectDockImpl</name>
<message>
<location filename="../docks/project/generixprojectdock.cpp" line="139"/>
<location filename="../docks/project/generixprojectdock.cpp" line="148"/>
<source>Generix Business View</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/project/generixprojectdock.cpp" line="162"/>
<location filename="../docks/project/generixprojectdock.cpp" line="171"/>
<source>&amp;Business view for file :
%1</source>
<translation type="unfinished"></translation>
@ -354,7 +396,7 @@
<context>
<name>ItemModelFactory</name>
<message>
<location filename="../configuration/itemmodelfactory.cpp" line="86"/>
<location filename="../configuration/itemmodelfactory.cpp" line="87"/>
<source>Aliases</source>
<translation type="unfinished"></translation>
</message>
@ -376,42 +418,37 @@
<name>NewGenerixDerivation1Page</name>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation1page.ui" line="14"/>
<source>WizardPage</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation1page.ui" line="17"/>
<source>Do you want derivate or edit a standard project</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation1page.ui" line="20"/>
<location filename="../projectproperty/wizard/newgenerixderivation1page.ui" line="17"/>
<source>Choose to derivate from a standard project, offer you to copy file in another tree automatically.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation1page.ui" line="26"/>
<location filename="../projectproperty/wizard/newgenerixderivation1page.ui" line="23"/>
<source>Please tell me, if you want to modify all part of the web module, or prevent the modification of orignal files and derive file in special directory.
In &lt;b&gt;GCE 150&lt;/b&gt; or later, the choice has few impact</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation1page.ui" line="40"/>
<location filename="../projectproperty/wizard/newgenerixderivation1page.ui" line="37"/>
<source>&amp;No derivation (editor)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation1page.ui" line="47"/>
<location filename="../projectproperty/wizard/newgenerixderivation1page.ui" line="44"/>
<source>Derivation in a &amp;project directory (integration)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation1page.ui" line="77"/>
<location filename="../projectproperty/wizard/newgenerixderivation1page.ui" line="74"/>
<source>&amp;Name of the project directory : </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation1page.ui" line="90"/>
<location filename="../projectproperty/wizard/newgenerixderivation1page.ui" line="87"/>
<source>Add the project directory name as prefix</source>
<translation type="unfinished"></translation>
</message>
@ -420,79 +457,59 @@ In &lt;b&gt;GCE 150&lt;/b&gt; or later, the choice has few impact</source>
<name>NewGenerixDerivation2Page</name>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation2page.ui" line="14"/>
<source>WizardPage</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation2page.ui" line="17"/>
<source>Define path that should be read only</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation2page.ui" line="20"/>
<location filename="../projectproperty/wizard/newgenerixderivation2page.ui" line="17"/>
<source>Define the path you want to make read only in your web module. Generally, you should have one path not readonly and all other read only.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation2page.ui" line="26"/>
<location filename="../projectproperty/wizard/newgenerixderivation2page.ui" line="23"/>
<source>In this list you have all directory detected by &lt;b&gt;XINX&lt;/b&gt;. If the list isn&apos;t complete, you can add or modify the list, later, in the project property.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation2page.ui" line="36"/>
<location filename="../projectproperty/wizard/newgenerixderivation2page.ui" line="33"/>
<source>In the list, please check directory that you want make read-only (While modify a file in this directory, this will open a dialog to derive the fie. You always can force to save the file in the original directory.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation2page.ui" line="63"/>
<source>langue/fra/nav</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation2page.ui" line="71"/>
<source>langue/fra/nav/project</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>NewGenerixDerivation3Page</name>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation3page.ui" line="14"/>
<source>WizardPage</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation3page.ui" line="17"/>
<source>Define option for derivation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation3page.ui" line="20"/>
<location filename="../projectproperty/wizard/newgenerixderivation3page.ui" line="17"/>
<source>In this page you can define a prefix to use in your derivation path and the possibility to copy the original file in the destination path too.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation3page.ui" line="26"/>
<location filename="../projectproperty/wizard/newgenerixderivation3page.ui" line="23"/>
<source>&amp;Create automatically missing directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation3page.ui" line="33"/>
<location filename="../projectproperty/wizard/newgenerixderivation3page.ui" line="30"/>
<source>&lt;span style=&quot;color: red&quot;&gt;&lt;b&gt;!!! WARNING !!!&lt;/b&gt; : You should check this box, if you don&apos;t want have problem.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation3page.ui" line="40"/>
<location filename="../projectproperty/wizard/newgenerixderivation3page.ui" line="37"/>
<source>&amp;Prefix derivated files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation3page.ui" line="74"/>
<location filename="../projectproperty/wizard/newgenerixderivation3page.ui" line="71"/>
<source>&lt;span style=&quot;color: red&quot;&gt;&lt;b&gt;!!! WARNING !!!&lt;/b&gt; : You should define a prefix, in derivation project mode on this version of GCE.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixderivation3page.ui" line="84"/>
<location filename="../projectproperty/wizard/newgenerixderivation3page.ui" line="81"/>
<source>C&amp;opy source file in the derivation path</source>
<translation type="unfinished"></translation>
</message>
@ -501,43 +518,38 @@ In &lt;b&gt;GCE 150&lt;/b&gt; or later, the choice has few impact</source>
<name>NewGenerixInformationPage</name>
<message>
<location filename="../projectproperty/wizard/newgenerixinformationpage.ui" line="17"/>
<source>WizardPage</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixinformationpage.ui" line="20"/>
<source>Define informations used by the Generix module of XINX</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixinformationpage.ui" line="23"/>
<location filename="../projectproperty/wizard/newgenerixinformationpage.ui" line="20"/>
<source>In this page, you choose, the location of the Webmodule. This path should be the same of the project path, unless you know what you do.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixinformationpage.ui" line="29"/>
<location filename="../projectproperty/wizard/newgenerixinformationpage.ui" line="26"/>
<source>This page show you the finding version of your GCE Installation. If the version number doesn&apos;t corresponding with your GCE Installation, please verify the configuration of your project. This will have an impact on the directory structure choosed by XINX and on how XINX will access to dictionnary and BV.
On &quot;Location of the data stream&quot; you can fill by the location of the &quot;j2ee/home/log&quot; directory of your Application Server. This will be added as a link in your project to permit you an easy access to open a data stream.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixinformationpage.ui" line="62"/>
<location filename="../projectproperty/wizard/newgenerixinformationpage.ui" line="59"/>
<source>Version :</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixinformationpage.ui" line="72"/>
<location filename="../projectproperty/wizard/newgenerixinformationpage.ui" line="69"/>
<source>Location of the &amp;data stream :</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixinformationpage.ui" line="89"/>
<location filename="../projectproperty/wizard/newgenerixinformationpage.ui" line="86"/>
<source>Location of the &amp;running page :</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../projectproperty/wizard/newgenerixinformationpage.ui" line="124"/>
<location filename="../projectproperty/wizard/newgenerixinformationpage.ui" line="121"/>
<source>&lt;p style=&quot;color: red&quot;&gt;&lt;b&gt;!!! WARNING !!!&lt;/b&gt; : The directory structure doesn&apos;t match with the version of the GCE module.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>

View File

@ -1,6 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="en_US">
<context>
<name>AddModifyLabelDialog</name>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="17"/>
<source>Adding/Modify dictionary label</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="23"/>
<source>&amp;Code :</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="36"/>
<source>&amp;Langue</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="53"/>
<source>&amp;Description :</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="76"/>
<source>C&amp;ontext :</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AliasItem</name>
<message>
@ -122,26 +150,30 @@
<context>
<name>DictionaryDockWidget</name>
<message>
<location filename="../ui/dictionarydockwidget.ui" line="14"/>
<location filename="../docks/dictionary/dictionarydockwidget.ui" line="14"/>
<source>Dictionary</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/dictionarydockwidget.ui" line="32"/>
<location filename="../ui/dictionarydockwidget.ui" line="46"/>
<source>...</source>
<location filename="../docks/dictionary/dictionarydockwidget.ui" line="28"/>
<source>Add a new label</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DictionaryDockWidgetImpl</name>
<message>
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="30"/>
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="69"/>
<source>Dictionary</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="105"/>
<source>No label(s) loaded.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="45"/>
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="109"/>
<source>%n label(s) loaded.</source>
<translation type="unfinished">
<numerusform></numerusform>
@ -152,7 +184,17 @@
<context>
<name>DictionaryModel</name>
<message>
<location filename="../docks/dictionary/dictionarymodel.cpp" line="67"/>
<location filename="../docks/dictionary/dictionarymodel.cpp" line="104"/>
<source>Can&apos;t open the dictionary for write : %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/dictionarymodel.cpp" line="199"/>
<source>Can&apos;t parse the dictionary for write : %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/dictionarymodel.cpp" line="233"/>
<source>Please type a prefix to list labels.</source>
<translation type="unfinished"></translation>
</message>
@ -160,7 +202,7 @@
<context>
<name>Gce150FileResolver</name>
<message>
<location filename="../pluginresolver/gce150fileresolver.cpp" line="50"/>
<location filename="../pluginresolver/gce150fileresolver.cpp" line="51"/>
<source>GCE150 File Resolver</source>
<translation type="unfinished"></translation>
</message>
@ -189,17 +231,17 @@
<context>
<name>GcePropertiesParser</name>
<message>
<location filename="../configuration/gcepropertiesparser.cpp" line="67"/>
<location filename="../configuration/gcepropertiesparser.cpp" line="68"/>
<source>Can&apos;t open the gce properties file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../configuration/gcepropertiesparser.cpp" line="75"/>
<location filename="../configuration/gcepropertiesparser.cpp" line="76"/>
<source>Can&apos;t read the root element of the gce properties file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../configuration/gcepropertiesparser.cpp" line="84"/>
<location filename="../configuration/gcepropertiesparser.cpp" line="85"/>
<source>Unable to create new XPath context</source>
<translation type="unfinished"></translation>
</message>
@ -207,18 +249,18 @@
<context>
<name>Generix::Dictionary::Parser</name>
<message>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="77"/>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="78"/>
<source>The file is not an dictionary file.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="103"/>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="129"/>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="104"/>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="130"/>
<source>Labels node expected. %1 found</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="157"/>
<location filename="../docks/dictionary/dictionary_parser.cpp" line="158"/>
<source>Label node expected. %1 found</source>
<translation type="unfinished"></translation>
</message>
@ -285,12 +327,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugindefinition/generix.cpp" line="112"/>
<location filename="../plugindefinition/generix.cpp" line="108"/>
<source>Plugin for Generix</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugindefinition/generix.cpp" line="114"/>
<location filename="../plugindefinition/generix.cpp" line="110"/>
<source>This plugin add some fonctionnality usefull for Generix Group&apos;s XINX users</source>
<translation type="unfinished"></translation>
</message>
@ -298,12 +340,12 @@
<context>
<name>GenerixProjectDockImpl</name>
<message>
<location filename="../docks/project/generixprojectdock.cpp" line="139"/>
<location filename="../docks/project/generixprojectdock.cpp" line="148"/>
<source>Generix Business View</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/project/generixprojectdock.cpp" line="162"/>
<location filename="../docks/project/generixprojectdock.cpp" line="171"/>
<source>&amp;Business view for file :
%1</source>
<translation type="unfinished"></translation>
@ -354,7 +396,7 @@
<context>
<name>ItemModelFactory</name>
<message>
<location filename="../configuration/itemmodelfactory.cpp" line="86"/>
<location filename="../configuration/itemmodelfactory.cpp" line="87"/>
<source>Aliases</source>
<translation type="unfinished"></translation>
</message>

View File

@ -1,6 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="fr_FR">
<context>
<name>AddModifyLabelDialog</name>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="17"/>
<source>Adding/Modify dictionary label</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="23"/>
<source>&amp;Code :</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="36"/>
<source>&amp;Langue</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="53"/>
<source>&amp;Description :</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../docks/dictionary/addmodifylabeldialog.ui" line="76"/>
<source>C&amp;ontext :</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AliasItem</name>
<message>
@ -137,26 +165,34 @@
<context>
<name>DictionaryDockWidget</name>
<message>
<location filename="../ui/dictionarydockwidget.ui" line="14"/>
<location filename="../docks/dictionary/dictionarydockwidget.ui" line="14"/>
<source>Dictionary</source>
<translation>Dictionnaire</translation>
</message>
<message>
<location filename="../ui/dictionarydockwidget.ui" line="32"/>
<location filename="../ui/dictionarydockwidget.ui" line="46"/>
<location filename="../docks/dictionary/dictionarydockwidget.ui" line="28"/>
<source>Add a new label</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>...</source>
<translation>...</translation>
<translation type="obsolete">...</translation>
</message>
</context>
<context>
<name>DictionaryDockWidgetImpl</name>
<message>
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="30"/>
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="69"/>
<source>Dictionary</source>
<translation>Dictionnaire</translation>
</message>
<message>
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="105"/>
<source>No label(s) loaded.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="45"/>
<location filename="../docks/dictionary/dictionarydockwidgetimpl.cpp" line="109"/>
<source>%n label(s) loaded.</source>
<translation>
<numerusform>%n libellé chargé.</numerusform>
@ -171,7 +207,17 @@
<context>
<name>DictionaryModel</name>
<message>