diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-14 20:09:41 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-05-14 20:09:41 -0500 |
commit | 07b3d083b49b4cbb248b5ba0aeba2bbdd3cc487d (patch) | |
tree | 5f80a6862e44b938c4e7f62f457d1b48f5a0195b /shell | |
parent | 007f16ef7ad40ae932df884ba04f0de71928b852 (diff) |
TDE integration
Change-Id: I6f468005c8d8d99d9251a9c4fe4629b98bc4aa5e
Diffstat (limited to 'shell')
-rw-r--r-- | shell/inc/shell/kde_headers.h (renamed from shell/inc/kde_headers.h) | 8 | ||||
-rw-r--r-- | shell/inc/shell/tde_defines.h | 93 | ||||
-rw-r--r-- | shell/inc/shell/tde_headers.h | 97 | ||||
-rw-r--r-- | shell/prj/d.lst | 6 | ||||
-rw-r--r-- | shell/source/backends/kdebe/kdeaccess.cxx | 2 | ||||
-rw-r--r-- | shell/source/backends/kdebe/kdebackend.cxx | 2 | ||||
-rw-r--r-- | shell/source/backends/kdebe/makefile.mk | 45 | ||||
-rw-r--r-- | shell/source/backends/kdebe/tdebe1.component | 34 | ||||
-rw-r--r-- | shell/source/unix/misc/makefile.mk | 1 | ||||
-rw-r--r-- | shell/source/unix/misc/tde-open-url.sh | 10 |
10 files changed, 290 insertions, 8 deletions
diff --git a/shell/inc/kde_headers.h b/shell/inc/shell/kde_headers.h index 7ec45fdc383d..d92fceb34122 100644 --- a/shell/inc/kde_headers.h +++ b/shell/inc/shell/kde_headers.h @@ -29,6 +29,12 @@ #ifndef INCLUDED_VCL_KDE_HEADERS_H #define INCLUDED_VCL_KDE_HEADERS_H +#ifdef ENABLE_TDE + +#include "shell/tde_headers.h" + +#else // ENABLE_TDE + /* ********* Suppress warnings if needed */ #include "sal/config.h" @@ -93,6 +99,8 @@ #include <kabc/field.h> #include <kabc/stdaddressbook.h> +#endif // ENABLE_TDE + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/inc/shell/tde_defines.h b/shell/inc/shell/tde_defines.h new file mode 100644 index 000000000000..52e610c72020 --- /dev/null +++ b/shell/inc/shell/tde_defines.h @@ -0,0 +1,93 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * Timothy Pearson <kb9vqf@pearsoncomputing.net> (C) 2012, All Rights Reserved. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + * + ************************************************************************/ + +#ifndef INCLUDED_VCL_TDE_DEFINE_HEADERS_H +#define INCLUDED_VCL_TDE_DEFINE_HEADERS_H + +#define QObject TQObject +#define QWidget TQWidget +#define QVBox TQVBox +#define QHBox TQHBox +#define QGrid TQGrid +#define QString TQString +#define QStringList TQStringList +#define QCustomEvent TQCustomEvent +#define QMutex TQMutex +#define QEvent TQEvent +#define QFont TQFont +#define QDateTime TQDateTime +#define QThread TQThread +#define QStyle TQStyle +#define QApplication TQApplication +#define QRect TQRect +#define QProgressBar TQProgressBar +#define QPopupMenu TQPopupMenu +#define QMenuBar TQMenuBar +#define QToolButton TQToolButton +#define QToolBar TQToolBar +#define QScrollBar TQScrollBar +#define QListView TQListView +#define QSpinWidget TQSpinWidget +#define QScrollBar TQScrollBar +#define QLineEdit TQLineEdit +#define QComboBox TQComboBox +#define QCheckBox TQCheckBox +#define QRadioButton TQRadioButton +#define QPushButton TQPushButton +#define QPainter TQPainter +#define QResizeEvent TQResizeEvent +#define QShowEvent TQShowEvent +#define QPoint TQPoint +#define QDialog TQDialog +#define QFile TQFile +#define QLabel TQLabel +#define QObjectList TQObjectList +#define QCString TQCString +#define QRegExp TQRegExp +#define QSessionManager TQSessionManager +#define QPaintDevice TQPaintDevice +#define QTextIStream TQTextIStream +#define QTextStream TQTextStream +#define QMutexLocker TQMutexLocker +#define QValueList TQValueList +#define QTab TQTab +#define QTabBar TQTabBar +#define QTabWidget TQTabWidget +#define QMainWindow TQMainWindow +#define QPixmap TQPixmap +#define QColorGroup TQColorGroup +#define QStyleOption TQStyleOption +#define QSize TQSize +#define QMenuItem TQMenuItem +#define QFontInfo TQFontInfo + +#define qSwap tqSwap +#define qt_cast tqt_cast +#define qt_xdisplay tqt_xdisplay +#define qVersion tqVersion + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/inc/shell/tde_headers.h b/shell/inc/shell/tde_headers.h new file mode 100644 index 000000000000..d0f14447dd7b --- /dev/null +++ b/shell/inc/shell/tde_headers.h @@ -0,0 +1,97 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * Timothy Pearson <kb9vqf@pearsoncomputing.net> (C) 2012, All Rights Reserved. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + * + ************************************************************************/ + +#ifndef INCLUDED_VCL_TDE_HEADERS_H +#define INCLUDED_VCL_TDE_HEADERS_H + +/* ********* Suppress warnings if needed */ +#include "sal/config.h" + +#include <cstddef> + +#if defined __GNUC__ +#pragma GCC system_header +#endif + + +/* ********* Hack, but needed because of conflicting types... */ +#define Region TQtXRegion + + +/* ********* TQt headers */ +#include <tqaccessible.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqfont.h> +#include <tqframe.h> +#include <tqlineedit.h> +#include <tqlistview.h> +#include <tqmainwindow.h> +#include <tqmenudata.h> +#include <tqpaintdevice.h> +#include <tqpainter.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqrangecontrol.h> +#include <tqstring.h> +#include <tqtabbar.h> +#include <tqtabwidget.h> +#include <tqtoolbar.h> +#include <tqtoolbutton.h> +#include <tqwidget.h> +#include <tqprogressbar.h> + +/* ********* See hack on top of this file */ +#undef Region + + +/* ********* TDE base headers */ +#include <kaboutdata.h> +#include <kapplication.h> +#include <kcmdlineargs.h> +#include <kconfig.h> +#include <tdeversion.h> +#include <kemailsettings.h> +#include <kglobal.h> +#include <kglobalsettings.h> +#include <klocale.h> +#include <kmainwindow.h> +#include <kmenubar.h> +#include <kprotocolmanager.h> +#include <kstartupinfo.h> +#include <kstyle.h> + + +/* ********* TDE address book connectivity headers */ +#include <kabc/addressbook.h> +#include <kabc/addressee.h> +#include <kabc/field.h> +#include <kabc/stdaddressbook.h> + +#include "tde_defines.h" + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/prj/d.lst b/shell/prj/d.lst index 62dfa80d752c..435ed347a4e9 100644 --- a/shell/prj/d.lst +++ b/shell/prj/d.lst @@ -14,6 +14,7 @@ ..\%__SRC%\bin\open-url %_DEST%\bin\open-url ..\%__SRC%\bin\cde-open-url %_DEST%\bin\cde-open-url +..\%__SRC%\bin\tde-open-url %_DEST%\bin\tde-open-url ..\%__SRC%\bin\kde-open-url %_DEST%\bin\kde-open-url ..\%__SRC%\bin\gnome-open-url %_DEST%\bin\gnome-open-url ..\%__SRC%\bin\gnome-open-url.bin %_DEST%\bin\gnome-open-url.bin @@ -25,9 +26,12 @@ ..\%__SRC%\misc\desktopbe1.component %_DEST%\xml\desktopbe1.component ..\%__SRC%\misc\gconfbe1.component %_DEST%\xml\gconfbe1.component +..\%__SRC%\misc\tdebe1.component %_DEST%\xml\tdebe1.component ..\%__SRC%\misc\kde4be1.component %_DEST%\xml\kde4be1.component ..\%__SRC%\misc\kdebe1.component %_DEST%\xml\kdebe1.component -..\inc\kde_headers.h %_DEST%\inc\shell\kde_headers.h +..\inc\shell\tde_headers.h %_DEST%\inc\shell\tde_headers.h +..\inc\shell\tde_defines.h %_DEST%\inc\shell\tde_defines.h +..\inc\shell\kde_headers.h %_DEST%\inc\shell\kde_headers.h ..\%__SRC%\misc\localebe1.component %_DEST%\xml\localebe1.component ..\%__SRC%\misc\macbe1.component %_DEST%\xml\macbe1.component ..\%__SRC%\misc\smplmail.component %_DEST%\xml\smplmail.component diff --git a/shell/source/backends/kdebe/kdeaccess.cxx b/shell/source/backends/kdebe/kdeaccess.cxx index 0d7ad8ddd27a..ed9df8fa417e 100644 --- a/shell/source/backends/kdebe/kdeaccess.cxx +++ b/shell/source/backends/kdebe/kdeaccess.cxx @@ -35,7 +35,7 @@ #include "rtl/string.h" #include "rtl/ustring.hxx" -#include "kde_headers.h" +#include "shell/kde_headers.h" #include "kdeaccess.hxx" diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index 64321545111b..4faf91106560 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -58,7 +58,7 @@ #include "uno/current_context.hxx" #include "uno/lbnames.h" -#include "kde_headers.h" +#include "shell/kde_headers.h" #include "kdeaccess.hxx" diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk index 265a3b691267..948d1a590f3e 100644 --- a/shell/source/backends/kdebe/makefile.mk +++ b/shell/source/backends/kdebe/makefile.mk @@ -27,8 +27,8 @@ PRJ=..$/..$/.. PRJNAME=shell -TARGET=kdebe +TARGET=kdebe LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE VISIBILITY_HIDDEN=TRUE @@ -47,7 +47,39 @@ CFLAGSCXX+=-Wno-shadow # no "lib" prefix DLLPRE = +.IF "$(ENABLE_TDE)" == "TRUE" +TARGET=tdebe + +CFLAGS+=$(TDE_CFLAGS) +CFLAGS+=-DENABLE_TDE +CFLAGSCXX+=-DENABLE_TDE + +# --- Files --- + +SLOFILES=\ + $(SLO)$/kdeaccess.obj \ + $(SLO)$/kdebackend.obj + +SHL1NOCHECK=TRUE +SHL1TARGET=$(TARGET)1.uno +SHL1OBJS=$(SLOFILES) +SHL1DEF=$(MISC)$/$(SHL1TARGET).def + +SHL1IMPLIB=i$(SHL1TARGET) +SHL1STDLIBS= \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALLIB) \ + $(TDE_LIBS) \ + -lkio + +SHL1DEF=$(MISC)$/$(SHL1TARGET).def +DEF1NAME=$(SHL1TARGET) + +.ENDIF # "$(ENABLE_TDE)" == "TRUE" + .IF "$(ENABLE_KDE)" == "TRUE" +TARGET=kdebe CFLAGS+=$(KDE_CFLAGS) @@ -79,10 +111,13 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk -ALLTAR : $(MISC)/kdebe1.component +.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_TDE)" == "TRUE" + +ALLTAR : $(MISC)/$(TARGET)1.component -$(MISC)/kdebe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - kdebe1.component +$(MISC)/$(TARGET)1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + $(TARGET)1.component $(XSLTPROC) --nonet --stringparam uri \ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt kdebe1.component + $(SOLARENV)/bin/createcomponent.xslt $(TARGET)1.component +.ENDIF diff --git a/shell/source/backends/kdebe/tdebe1.component b/shell/source/backends/kdebe/tdebe1.component new file mode 100644 index 000000000000..55a3776898a4 --- /dev/null +++ b/shell/source/backends/kdebe/tdebe1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org 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 Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.TDEBackend"> + <service name="com.sun.star.configuration.backend.TDEBackend"/> + </implementation> +</component> diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk index 6805ad41a9f4..39752bdc4644 100644 --- a/shell/source/unix/misc/makefile.mk +++ b/shell/source/unix/misc/makefile.mk @@ -52,6 +52,7 @@ SCRIPTFILES = \ $(BIN)$/open-url \ $(BIN)$/cde-open-url \ $(BIN)$/gnome-open-url \ + $(BIN)$/tde-open-url \ $(BIN)$/kde-open-url APP1TARGET = gnome-open-url.bin diff --git a/shell/source/unix/misc/tde-open-url.sh b/shell/source/unix/misc/tde-open-url.sh new file mode 100644 index 000000000000..fa05bdecbda4 --- /dev/null +++ b/shell/source/unix/misc/tde-open-url.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# special handling for mailto: uris +if echo $1 | grep '^mailto:' > /dev/null; then + kmailservice "$1" & +else + kfmclient openURL "$1" & +fi + +exit 0 |