Ulrich Van Den Hekke 13 years ago
parent
commit
3b21504a53
  1. 28
      plugins/webplugin/xsl/htmlfileeditor.cpp
  2. 2
      setup/xinx-setup.iss
  3. 6
      setup/xinx-setup.nsi
  4. 0
      xml/baseplugin_js.xml
  5. 0
      xml/baseplugin_xml.xml
  6. 0
      xml/completion.xnx
  7. 0
      xml/template.xml

28
plugins/webplugin/xsl/htmlfileeditor.cpp

@ -214,18 +214,20 @@ void XmlFileEditor::loadFromDevice( QIODevice & d ) {
/* StyleSheetEditor */
StyleSheetEditor::StyleSheetEditor( QWidget *parent ) : ContentViewTextEditor( new XslContentViewParser(), new XslTextEditor(), parent ), m_parsingOutputFile(0), m_parsingStyleSheetFile( 0 ) {
m_htmlView = new QWebView( this );
m_htmlView->load( QUrl( "about:blank" ) );
m_htmlView->setMinimumHeight( 100 );
splitter()->addWidget( m_htmlView );
configurationChanged();
m_parsingProcess = new QProcess( this );
m_parsingProcess->setWorkingDirectory( XINXProjectManager::self()->project()->projectPath() );
m_parsingProcess->setProcessChannelMode( QProcess::MergedChannels );
connect( m_parsingProcess, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(parsingFinished()) );
connect( SelfWebPluginSettings::self(), SIGNAL(changed()), this, SLOT(configurationChanged()) );
connect( textEdit()->editor(), SIGNAL(cursorPositionChanged()), this, SLOT(cursorPositionChanged()) );
if( XINXProjectManager::self()->project() ) {
m_htmlView = new QWebView( this );
m_htmlView->load( QUrl( "about:blank" ) );
m_htmlView->setMinimumHeight( 100 );
splitter()->addWidget( m_htmlView );
configurationChanged();
m_parsingProcess = new QProcess( this );
m_parsingProcess->setWorkingDirectory( XINXProjectManager::self()->project()->projectPath() );
m_parsingProcess->setProcessChannelMode( QProcess::MergedChannels );
connect( m_parsingProcess, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(parsingFinished()) );
connect( SelfWebPluginSettings::self(), SIGNAL(changed()), this, SLOT(configurationChanged()) );
connect( textEdit()->editor(), SIGNAL(cursorPositionChanged()), this, SLOT(cursorPositionChanged()) );
}
m_completionModel = new XslCompletionNodeModel( rootNode(), this );
m_completionModel->setCompleteTags( XslCompletionNodeModel::NoTags );
@ -258,7 +260,7 @@ void StyleSheetEditor::parsingFinished() {
// Show Stylesheet
if( SelfWebPluginSettings::self()->config().stylesheetParsing.viewer.type == "internal" ) {
QString moduleInternetAdresse = XINXProjectManager::self()->project()->readProperty( "moduleInternetAdresse" ).toString();
QString moduleInternetAdresse = XINXProjectManager::self()->project() ? XINXProjectManager::self()->project()->readProperty( "moduleInternetAdresse" ).toString() : QString();
if( moduleInternetAdresse.isEmpty() )
qWarning( qPrintable( tr( "Please give the internet adresse of the servlet control of the web module (like http://localhost/ear/war/dir/Servlet) in property project" ) ) );
m_htmlView->setHtml( m_parsingOutput, QUrl( moduleInternetAdresse ) );

2
setup/xinx-setup.iss

@ -65,7 +65,7 @@ Source: {#QTDIR}\bin\QtWebKit4.dll; DestDir: {app}\bin; Components: application;
Source: {#QTDIR}\bin\QtXml4.dll; DestDir: {app}\bin; Components: application; Flags: sharedfile
Source: {#QTDIR}\bin\QtXmlPatterns4.dll; DestDir: {app}\bin; Components: application; Flags: sharedfile
Source: ..\xinx\xml\*.xml; DestDir: {app}\xml; Components: application
Source: ..\xml\*.xml; DestDir: {app}\xml; Components: application
DestDir: {app}\scripts; Source: ..\scripts\*.xq; Components: application
Source: ..\src.7z; DestDir: {app}; Components: source; Flags: replacesameversion;

6
setup/xinx-setup.nsi

@ -117,9 +117,9 @@ Section Application SEC_XNX_APP
SetOutPath $INSTDIR\xml
SetOverwrite on
File ..\xinx\xml\baseplugin_js.xml
File ..\xinx\xml\baseplugin_xml.xml
File ..\xinx\xml\template.xml
File ..\xml\baseplugin_js.xml
File ..\xml\baseplugin_xml.xml
File ..\xml\template.xml
File ..\scripts\conf_businessviewlist.xq
File ..\scripts\conf_version.xq

0
xinx/xml/baseplugin_js.xml → xml/baseplugin_js.xml

0
xinx/xml/baseplugin_xml.xml → xml/baseplugin_xml.xml

0
xinx/xml/completion.xnx → xml/completion.xnx

0
xinx/xml/template.xml → xml/template.xml

Loading…
Cancel
Save