git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64354 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/ChromiumBasedEditors 2/app/test/main.cpp

-#pragma once
-
 #include <QFile>
 #include <QScreen>
 #include <QDir>

DesktopEditor/ChromiumBasedEditors 2/app/test/src/ASCDocumentEditor.pro

@@ -3,6 +3,8 @@ QT  += core gui widgets printsupport
 TEMPLATE = app
 CONFIG += app_bundle
 
+CONFIG += c++11
+
 CONFIG -= debug_and_release debug_and_release_target
 
 CONFIG(debug, debug|release) {
@@ -19,6 +21,14 @@ win32:!contains(QMAKE_TARGET.arch, x86_64):{
     PLATFORM_BUILD = win32
     message(windows32)
 }
+linux-g++:contains(QMAKE_HOST.arch, x86_64):{
+    PLATFORM_BUILD = linux64
+    message(linux64)
+}
+linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
+    PLATFORM_BUILD = linux32
+    message(linux32)
+}
 
 CONFIG(debug, debug|release) {
     PLATFORM_BUILD2 = $$PLATFORM_BUILD/debug
@@ -30,7 +40,12 @@ CONFIG(debug, debug|release) {
 include($$PWD/AscDocumentEditor.pri)
 
 SOURCES += \
-    $$PWD/main.cpp
+    $$PWD/main_cp.cpp
+
+win32 {
+    LIBS += -L$$PWD/../../cefbuilds/$$PLATFORM_BUILD -llibcef
+} else {
+    LIBS += -L$$PWD/../../cefbuilds/$$PLATFORM_BUILD -lcef
+}
 
-LIBS += -L$$PWD/../../cefbuilds/$$PLATFORM_BUILD -llibcef
 LIBS += -L$$PWD/../../corebuilds/$$PLATFORM_BUILD2 -lascdocumentscore

DesktopEditor/ChromiumBasedEditors 2/app/test/src/AscDocumentEditor.pri

@@ -50,3 +50,15 @@ LIBS += -lwininet \
 
 QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.02
 }
+
+linux-g++ {
+    DEFINES += \
+        LINUX \
+        _LINUX \
+        _LINUX_QT
+
+    CONFIG += link_pkgconfig
+    PKGCONFIG += glib-2.0 gdk-2.0 gtkglext-1.0 atk cairo gtk+-unix-print-2.0
+
+    LIBS += -lz
+}

DesktopEditor/ChromiumBasedEditors 2/app/test/src/QAscApplicationManager.h

 #ifndef QASCAPPLICATIONMANAGER
 #define QASCAPPLICATIONMANAGER
 
-#include "../../../lib/include/cefapplication.h"
-#include "../../../lib/include/applicationmanager.h"
-
-#include <shlwapi.h>
-#include <shlobj.h>
-#include <QFileDialog>
 #include "QAscMainPanel.h"
 
 class QAscApplicationManager : public CAscApplicationManager

DesktopEditor/ChromiumBasedEditors 2/app/test/src/QAscMain.h

@@ -5,7 +5,6 @@
 #include <QDir>
 
 #include "QAscApplicationManager.h"
-#include "QAscMainPanel.h"
 
 #ifdef WIN32
 #include <shlwapi.h>
@@ -13,6 +12,7 @@
 #endif
 
 #include <QStandardPaths>
+#include <QApplication>
 
 static std::wstring GetAppDataPath()
 {
@@ -129,9 +129,6 @@ static int AscEditor_Main( int argc, char *argv[] )
     mainFont.setStyleStrategy( QFont::PreferAntialias );
     a.setFont( mainFont );
 
-    // Background color
-    HBRUSH windowBackground = CreateSolidBrush( RGB( 49, 52, 55 ) );
-
     // Create window
     QAscMainWindow w(NULL, pApplicationManager);
     w.show();

DesktopEditor/ChromiumBasedEditors 2/app/test/src/QAscMainPanel.cpp

-#include <windows.h>
-
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QGridLayout>
 #include <QtWidgets/QPushButton>
 #include <QScrollArea>
 #include <QFileDialog>
 
-#include "QAscMainPanel.h"
 #include "QAscTabWidget.h"
 
 #include <QStandardPaths>
 
+#include "QAscMainPanel.h"
 #include "../../../lib/include/qascprinter.h"
 
 QAscMainPanel::QAscMainPanel( QWidget* parent, CAscApplicationManager* pManager, bool bIsCustomWindow ) : QWidget( parent )

DesktopEditor/ChromiumBasedEditors 2/app/test/src/QAscTabWidget.h

@@ -8,7 +8,6 @@
 #include <QStylePainter>
 #include <QStyleOption>
 
-#include "../../../lib/include/applicationmanager.h"
 #include "../../../lib/qcefview/qcefview.h"
 
 class QPushButtonWrapper : public QPushButton
@@ -371,7 +370,7 @@ public slots:
 
 #if 1
         std::string sId = std::to_string(nId);sId += "\n";
-        OutputDebugStringA(sId.c_str());
+        //OutputDebugStringA(sId.c_str());
 #endif
 
         NSEditorApi::CAscMenuEvent* pEvent = new NSEditorApi::CAscMenuEvent();

DesktopEditor/ChromiumBasedEditors 2/lib/include/applicationmanager_events.h

@@ -2,7 +2,6 @@
 #define APPLICATION_MANAGER_EVENTS_H
 
 #include "../../../Word_Api/Editor_Api.h"
-#include "base.h"
 
 #define ASC_MENU_EVENT_TYPE_CEF_CREATETAB       1001
 #define ASC_MENU_EVENT_TYPE_CEF_TABEDITORTYPE   1002
@@ -302,7 +301,7 @@ namespace NSEditorApi
         virtual void GetLogicalDPI(int& nDpiX, int& nDpiY) = 0;
         virtual void GetPhysicalRect(int& nX, int& nY, int& nW, int& nH) = 0;
         virtual void GetPrintAreaSize(int& nW, int& nH) = 0;
-        virtual void BitBlt(BYTE* pBGRA, const int& nRasterX, const int& nRasterY, const int& nRasterW, const int& nRasterH,
+        virtual void BitBlt(unsigned char* pBGRA, const int& nRasterX, const int& nRasterY, const int& nRasterW, const int& nRasterH,
                             const double& x, const double& y, const double& w, const double& h, const double& dAngle) = 0;
     };
 

DesktopEditor/ChromiumBasedEditors 2/lib/include/base.h

@@ -13,8 +13,9 @@
 
 #if defined(_LINUX) && !defined(_MAC)
 
-#include <X11/X.h>
-#define WindowHandleId XID
+//#include <X11/X.h>
+//typedef unsigned long XID;
+#define WindowHandleId unsigned long
 
 #endif
 

DesktopEditor/ChromiumBasedEditors 2/lib/include/cefview.h

 #ifndef CEFCLIENT_CEFWEBVIEW_H
 #define CEFCLIENT_CEFWEBVIEW_H
 
-#include "base.h"
+#include "./base.h"
 #include "./applicationmanager_events.h"
 
 enum CefViewWrapperType

DesktopEditor/ChromiumBasedEditors 2/lib/include/qascprinter.h

@@ -5,9 +5,9 @@
 #include <QtPrintSupport/QPrintDialog>
 #include <QPainter>
 #include <QPaintEngine>
+#include <qmath.h>
 
 #include "./applicationmanager_events.h"
-#include <qmath.h>
 
 class QAscPrinterContext : public NSEditorApi::CAscPrinterContextBase
 {

DesktopEditor/ChromiumBasedEditors 2/lib/qcefview/qcefview.h

 #ifndef CEFCLIENT_QCEFWEBVIEW_H
 #define CEFCLIENT_QCEFWEBVIEW_H
 
-#include "./../include/cefview.h"
-#include "./../include/applicationmanager.h"
-
 #include <QWidget>
 #include <QStyleOption>
 
+#include "./../include/cefview.h"
+#include "./../include/applicationmanager.h"
+
 class QCefView : public QWidget, public CCefViewWidgetImpl
 {
     Q_OBJECT