mirror of
https://bitbucket.org/smil3y/kde-playground.git
synced 2025-02-23 18:32:51 +00:00
kdepim: fix some build issues
This commit is contained in:
Ivailo Monev
parent
4538073f81
commit
debd191d6b
23 changed files with 266 additions and 167 deletions
|
|
@ -7,6 +7,8 @@ add_definitions( -DQT_NO_CAST_TO_ASCII )
|
|||
# Laurent install it if you want to debug it
|
||||
#add_subdirectory(tests)
|
||||
|
||||
add_definitions(-DQT_STATICPLUGIN)
|
||||
|
||||
set(libcomposereditor_ng_SRCS
|
||||
composereditor.cpp
|
||||
composerview.cpp
|
||||
|
|
@ -47,7 +49,6 @@ target_link_libraries(composereditorng
|
|||
${KDE4_KDEWEBKIT_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDE4_KPRINTUTILS_LIBS}
|
||||
)
|
||||
|
||||
|
||||
set_target_properties( composereditorng PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
|
||||
install(TARGETS composereditorng ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
install( FILES data/composereditorinitialhtml DESTINATION ${DATA_INSTALL_DIR}/composereditor )
|
||||
|
|
|
|||
|
|
@ -191,3 +191,6 @@ QObject* KWebKitPlatformPlugin::createExtension(Extension ext) const
|
|||
|
||||
Q_EXPORT_PLUGIN2(kwebspellchecker, KWebKitPlatformPlugin)
|
||||
Q_IMPORT_PLUGIN(kwebspellchecker)
|
||||
|
||||
#include "moc_qwebkitplatformplugin.cpp"
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#include <QtGlobal>
|
||||
#include <QtPlugin>
|
||||
#include <QWebKitPlatformPlugin>
|
||||
#include "qwebkitplatformplugin.h"
|
||||
#include <sonnet/speller.h>
|
||||
|
||||
class KWebSpellChecker : public QWebSpellChecker
|
||||
|
|
|
|||
201
kdepim/composereditor-ng/spellplugin/qwebkitplatformplugin.h
Normal file
201
kdepim/composereditor-ng/spellplugin/qwebkitplatformplugin.h
Normal file
|
|
@ -0,0 +1,201 @@
|
|||
/*
|
||||
* Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
|
||||
* Copyright (C) 2012 by Lindsay Mathieson <lindsay dot mathieson at gmail dot com>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library 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
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public License
|
||||
* along with this library; see the file COPYING.LIB. If not, write to
|
||||
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef QWEBKITPLATFORMPLUGIN_H
|
||||
#define QWEBKITPLATFORMPLUGIN_H
|
||||
|
||||
/*
|
||||
* Warning: The contents of this file is not part of the public QtWebKit API
|
||||
* and may be changed from version to version or even be completely removed.
|
||||
*/
|
||||
|
||||
#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
|
||||
#include <QMediaPlayer>
|
||||
#endif
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtCore/QUrl>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtGui/QFont>
|
||||
|
||||
class QWebSelectData
|
||||
{
|
||||
public:
|
||||
virtual ~QWebSelectData() {}
|
||||
|
||||
enum ItemType { Option, Group, Separator };
|
||||
|
||||
virtual ItemType itemType(int) const = 0;
|
||||
virtual QString itemText(int index) const = 0;
|
||||
virtual QString itemToolTip(int index) const = 0;
|
||||
virtual bool itemIsEnabled(int index) const = 0;
|
||||
virtual bool itemIsSelected(int index) const = 0;
|
||||
virtual int itemCount() const = 0;
|
||||
virtual bool multiple() const = 0;
|
||||
virtual QColor backgroundColor() const = 0;
|
||||
virtual QColor foregroundColor() const = 0;
|
||||
virtual QColor itemBackgroundColor(int index) const = 0;
|
||||
virtual QColor itemForegroundColor(int index) const = 0;
|
||||
};
|
||||
|
||||
class QWebSelectMethod : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
virtual ~QWebSelectMethod() {}
|
||||
|
||||
virtual void show(const QWebSelectData&) = 0;
|
||||
virtual void hide() = 0;
|
||||
virtual void setGeometry(const QRect&) = 0;
|
||||
virtual void setFont(const QFont&) = 0;
|
||||
|
||||
Q_SIGNALS:
|
||||
void selectItem(int index, bool allowMultiplySelections, bool shift);
|
||||
void didHide();
|
||||
};
|
||||
|
||||
class QWebNotificationData
|
||||
{
|
||||
public:
|
||||
virtual ~QWebNotificationData() {}
|
||||
|
||||
virtual const QString title() const = 0;
|
||||
virtual const QString message() const = 0;
|
||||
virtual const QUrl iconUrl() const = 0;
|
||||
virtual const QUrl openerPageUrl() const = 0;
|
||||
};
|
||||
|
||||
class QWebNotificationPresenter : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
QWebNotificationPresenter() {}
|
||||
virtual ~QWebNotificationPresenter() {}
|
||||
|
||||
virtual void showNotification(const QWebNotificationData*) = 0;
|
||||
|
||||
Q_SIGNALS:
|
||||
void notificationClosed();
|
||||
void notificationClicked();
|
||||
};
|
||||
|
||||
class QWebHapticFeedbackPlayer: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
QWebHapticFeedbackPlayer() {}
|
||||
virtual ~QWebHapticFeedbackPlayer() {}
|
||||
|
||||
enum HapticStrength
|
||||
{
|
||||
None, Weak, Medium, Strong
|
||||
};
|
||||
|
||||
enum HapticEvent
|
||||
{
|
||||
Press, Release
|
||||
};
|
||||
|
||||
virtual void playHapticFeedback(const HapticEvent, const QString& hapticType, const HapticStrength) = 0;
|
||||
};
|
||||
|
||||
class QWebTouchModifier : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
virtual ~QWebTouchModifier() {}
|
||||
|
||||
enum PaddingDirection
|
||||
{
|
||||
Up, Right, Down, Left
|
||||
};
|
||||
|
||||
virtual unsigned hitTestPaddingForTouch(const PaddingDirection) const = 0;
|
||||
};
|
||||
|
||||
#if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA
|
||||
class QWebFullScreenVideoHandler : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
QWebFullScreenVideoHandler() {}
|
||||
virtual ~QWebFullScreenVideoHandler() {}
|
||||
virtual bool requiresFullScreenForVideoPlayback() const = 0;
|
||||
|
||||
Q_SIGNALS:
|
||||
void fullScreenClosed();
|
||||
|
||||
public Q_SLOTS:
|
||||
virtual void enterFullScreen(QMediaPlayer*) = 0;
|
||||
virtual void exitFullScreen() = 0;
|
||||
};
|
||||
#endif
|
||||
|
||||
class QWebSpellChecker : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
struct GrammarDetail
|
||||
{
|
||||
int location;
|
||||
int length;
|
||||
QStringList guesses;
|
||||
QString userDescription;
|
||||
};
|
||||
|
||||
virtual bool isContinousSpellCheckingEnabled() const = 0;
|
||||
virtual void toggleContinousSpellChecking() = 0;
|
||||
|
||||
virtual void learnWord(const QString& word) = 0;
|
||||
virtual void ignoreWordInSpellDocument(const QString& word) = 0;
|
||||
virtual void checkSpellingOfString(const QString& word, int* misspellingLocation, int* misspellingLength) = 0;
|
||||
virtual QString autoCorrectSuggestionForMisspelledWord(const QString& word) = 0;
|
||||
virtual void guessesForWord(const QString& word, const QString& context, QStringList& guesses) = 0;
|
||||
|
||||
virtual bool isGrammarCheckingEnabled() = 0;
|
||||
virtual void toggleGrammarChecking() = 0;
|
||||
virtual void checkGrammarOfString(const QString&, QList<GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength) = 0;
|
||||
};
|
||||
|
||||
class QWebKitPlatformPlugin
|
||||
{
|
||||
public:
|
||||
virtual ~QWebKitPlatformPlugin() {}
|
||||
|
||||
enum Extension
|
||||
{
|
||||
MultipleSelections,
|
||||
Notifications,
|
||||
Haptics,
|
||||
TouchInteraction,
|
||||
FullScreenVideoPlayer,
|
||||
SpellChecker
|
||||
};
|
||||
|
||||
virtual bool supportsExtension(Extension) const = 0;
|
||||
virtual QObject* createExtension(Extension) const = 0;
|
||||
};
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.9")
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QWEBKITPLATFORMPLUGIN_H
|
||||
|
|
@ -6,8 +6,6 @@ add_definitions(-DQT_STRICT_ITERATORS)
|
|||
add_definitions( -DQT_NO_CAST_FROM_ASCII )
|
||||
add_definitions( -DQT_NO_CAST_TO_ASCII )
|
||||
|
||||
set(CMAKE_AUTOMOC_RELAXED_MODE ON)
|
||||
|
||||
option(KALARM_USE_AKONADI "Build to use Akonadi" ON)
|
||||
|
||||
# Kalarm from kdepim master needs kdepimlibs 4.7
|
||||
|
|
@ -25,12 +23,6 @@ endif()
|
|||
|
||||
if(KALARM_USE_AKONADI)
|
||||
add_definitions(-DUSE_AKONADI)
|
||||
if (NOT CMAKE_VERSION VERSION_LESS 2.8.12 AND (CMAKE_VERSION VERSION_LESS 2.8.12.1
|
||||
OR CMAKE_VERSION VERSION_LESS 2.8.13 # Temporary measure because build.kde.org uses a datestamped CMake version
|
||||
))
|
||||
# http://public.kitware.com/Bug/view.php?id=14535
|
||||
set(CMAKE_AUTOMOC_MOC_OPTIONS -DUSE_AKONADI)
|
||||
endif()
|
||||
else()
|
||||
add_definitions(-DUSE_KRESOURCES)
|
||||
add_definitions(
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ if(USABLE_ASSUAN_FOUND)
|
|||
uiserver/createchecksumscommand.cpp
|
||||
uiserver/verifychecksumscommand.cpp
|
||||
|
||||
libkleopatraclient/core/command.cpp
|
||||
libkleopatraclient/core/kleocommand.cpp
|
||||
selftest/uiservercheck.cpp
|
||||
)
|
||||
|
||||
|
|
@ -312,7 +312,7 @@ endif()
|
|||
|
||||
add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5151)
|
||||
|
||||
add_executable(kleopatra_bin ${_kleopatra_SRCS} mainwindow_desktop.cpp ${_kleopatra_uiserver_SRCS} ${_kleopatra_libkdepim_SRCS})
|
||||
add_executable(kleopatra_bin ${_kleopatra_SRCS} mainwindow.cpp ${_kleopatra_uiserver_SRCS} ${_kleopatra_libkdepim_SRCS})
|
||||
set_target_properties(kleopatra_bin PROPERTIES OUTPUT_NAME kleopatra)
|
||||
|
||||
target_link_libraries(kleopatra_bin
|
||||
|
|
|
|||
|
|
@ -26,13 +26,6 @@ if ( ASSUAN${ASSUAN_SUFFIX}_FOUND )
|
|||
set( USABLE_ASSUAN_FOUND true )
|
||||
endif( ASSUAN2_FOUND )
|
||||
|
||||
# TODO: this workaround will be removed as soon as we find better solution
|
||||
if(MINGW)
|
||||
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDE_DIR}/mingw)
|
||||
elseif(MSVC)
|
||||
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${KDEWIN32_INCLUDE_DIR}/msvc)
|
||||
endif(MINGW)
|
||||
|
||||
endif( ASSUAN${ASSUAN_SUFFIX}_FOUND )
|
||||
|
||||
if ( USABLE_ASSUAN_FOUND )
|
||||
|
|
|
|||
|
|
@ -26,12 +26,8 @@
|
|||
#endif
|
||||
|
||||
#if !defined(KPATH_SEPARATOR)
|
||||
#if defined _WIN32 || defined _WIN64
|
||||
#define KPATH_SEPARATOR ';'
|
||||
#else
|
||||
#define KPATH_SEPARATOR ':'
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* Mirrored from cmake option */
|
||||
#cmakedefine KLEO_STATIC_KCMODULES 1
|
||||
|
|
|
|||
|
|
@ -40,11 +40,10 @@
|
|||
|
||||
#include <kleo/stl_util.h>
|
||||
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include <QPushButton>
|
||||
#include <QValidator>
|
||||
|
||||
#include <ksharedconfig.h>
|
||||
#include <KConfigGroup>
|
||||
#include <KGlobal>
|
||||
#include <KLocalizedString>
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@
|
|||
|
||||
#include <gpgme++/key.h>
|
||||
|
||||
#include <KConfigGroup>
|
||||
#include <KGlobal>
|
||||
#include <KLocalizedString>
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ add_definitions(
|
|||
|
||||
add_library(kleopatraclientcore ${LIBRARY_TYPE}
|
||||
initialization.cpp
|
||||
command.cpp
|
||||
kleocommand.cpp
|
||||
selectcertificatecommand.cpp
|
||||
signencryptfilescommand.cpp
|
||||
decryptverifyfilescommand.cpp
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#ifndef __LIBKLEOPATRACLIENT_CORE_DECRYPTVERIFYFILESCOMMAND_H__
|
||||
#define __LIBKLEOPATRACLIENT_CORE_DECRYPTVERIFYFILESCOMMAND_H__
|
||||
|
||||
#include <libkleopatraclient/core/command.h>
|
||||
#include <libkleopatraclient/core/kleocommand.h>
|
||||
|
||||
namespace KLEOPATRACLIENT_NAMESPACE {
|
||||
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
|
||||
#include <config-kleopatra.h>
|
||||
|
||||
#include "command.h"
|
||||
#include "command_p.h"
|
||||
#include "kleocommand.h"
|
||||
#include "kleocommand_p.h"
|
||||
|
||||
#include <QtGlobal> // Q_OS_WIN
|
||||
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
#ifndef __LIBKLEOPATRACLIENT_CORE_COMMAND_P_H__
|
||||
#define __LIBKLEOPATRACLIENT_CORE_COMMAND_P_H__
|
||||
|
||||
#include "command.h"
|
||||
#include "kleocommand.h"
|
||||
|
||||
#include <QThread>
|
||||
#include <QMutex>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
#ifndef __LIBKLEOPATRACLIENT_CORE_SELECTCERTIFICATECOMMAND_H__
|
||||
#define __LIBKLEOPATRACLIENT_CORE_SELECTCERTIFICATECOMMAND_H__
|
||||
|
||||
#include <libkleopatraclient/core/command.h>
|
||||
#include <libkleopatraclient/core/kleocommand.h>
|
||||
|
||||
namespace KLEOPATRACLIENT_NAMESPACE {
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#ifndef __LIBKLEOPATRACLIENT_CORE_SIGNENCRYPTFILESCOMMAND_H__
|
||||
#define __LIBKLEOPATRACLIENT_CORE_SIGNENCRYPTFILESCOMMAND_H__
|
||||
|
||||
#include <libkleopatraclient/core/command.h>
|
||||
#include <libkleopatraclient/core/kleocommand.h>
|
||||
|
||||
namespace KLEOPATRACLIENT_NAMESPACE {
|
||||
|
||||
|
|
|
|||
|
|
@ -68,10 +68,6 @@ namespace Kleo {
|
|||
|
||||
#include <kleo/checksumdefinition.h>
|
||||
|
||||
#ifdef KDEPIM_MOBILE_UI
|
||||
# include <kdeclarativeapplication.h>
|
||||
#endif
|
||||
|
||||
#include <KDebug>
|
||||
#include <kcmdlineargs.h>
|
||||
#include <klocale.h>
|
||||
|
|
@ -207,19 +203,11 @@ int main( int argc, char** argv )
|
|||
AboutData aboutData;
|
||||
|
||||
KCmdLineArgs::init(argc, argv, &aboutData);
|
||||
|
||||
#ifdef KDEPIM_MOBILE_UI
|
||||
KDeclarativeApplicationBase::preApplicationSetup( KleopatraApplication::commandLineOptions() );
|
||||
#else
|
||||
KCmdLineArgs::addCmdLineOptions( KleopatraApplication::commandLineOptions() );
|
||||
#endif
|
||||
|
||||
kDebug() << "Statup timing:" << timer.elapsed() << "ms elapsed: Command line args created";
|
||||
|
||||
KleopatraApplication app;
|
||||
#ifdef KDEPIM_MOBILE_UI
|
||||
KDeclarativeApplicationBase::postApplicationSetup();
|
||||
#endif
|
||||
|
||||
kDebug() << "Startup timing:" << timer.elapsed() << "ms elapsed: Application created";
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
#include <config-kleopatra.h>
|
||||
|
||||
#include "mainwindow_desktop.h"
|
||||
#include "mainwindow.h"
|
||||
#include "aboutdata.h"
|
||||
|
||||
#include "models/keylistmodel.h"
|
||||
|
|
@ -94,12 +94,6 @@
|
|||
|
||||
#include <vector>
|
||||
|
||||
#ifdef Q_OS_WIN32
|
||||
static const bool OS_WIN = true;
|
||||
#else
|
||||
static const bool OS_WIN = false;
|
||||
#endif
|
||||
|
||||
using namespace Kleo;
|
||||
using namespace Kleo::Commands;
|
||||
using namespace boost;
|
||||
|
|
@ -319,10 +313,8 @@ void MainWindow::Private::setupActions() {
|
|||
const action_data action_data[] = {
|
||||
// most have been MOVED TO keylistcontroller.cpp
|
||||
// Tools menu
|
||||
#ifndef Q_OS_WIN
|
||||
{ "tools_start_kwatchgnupg", i18n("GnuPG Log Viewer"), QString(),
|
||||
"kwatchgnupg", q, SLOT(gnupgLogViewer()), QString(), false, true },
|
||||
#endif
|
||||
#if 0
|
||||
{ "tools_start_kgpgconf", i18n("GnuPG Administrative Console"), QString(),
|
||||
"kgpgconf", q, SLOT(gnupgLogViewer()), QString(), false, true },
|
||||
|
|
@ -335,11 +327,6 @@ void MainWindow::Private::setupActions() {
|
|||
// Settings menu
|
||||
{ "settings_self_test", i18n("Perform Self-Test"), QString(),
|
||||
0, q, SLOT(selfTest()), QString(), false, true },
|
||||
// Help menu
|
||||
#ifdef Q_WS_WIN
|
||||
{ "help_about_gpg4win", i18n("About Gpg4win"), QString(),
|
||||
"gpg4win-compact", q, SLOT(aboutGpg4Win()), QString(), false, true },
|
||||
#endif
|
||||
// most have been MOVED TO keylistcontroller.cpp
|
||||
};
|
||||
|
||||
|
|
@ -565,4 +552,4 @@ void MainWindow::saveProperties( KConfigGroup & cg )
|
|||
}
|
||||
}
|
||||
|
||||
#include "moc_mainwindow_desktop.cpp"
|
||||
#include "moc_mainwindow.cpp"
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
/* -*- mode: c++; c-basic-offset:4 -*-
|
||||
mainwindow.h
|
||||
mainwindow_desktop.h
|
||||
|
||||
This file is part of Kleopatra, the KDE keymanager
|
||||
Copyright (c) 2010 Klarälvdalens Datakonsult AB
|
||||
Copyright (c) 2007 Klarälvdalens Datakonsult AB
|
||||
|
||||
Kleopatra is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -30,13 +30,48 @@
|
|||
your version.
|
||||
*/
|
||||
|
||||
#ifndef __KLEOPATRA_MAINWINDOW_H__
|
||||
#define __KLEOPATRA_MAINWINDOW_H__
|
||||
#ifndef __KLEOPATRA_MAINWINDOW_DESKTOP_H__
|
||||
#define __KLEOPATRA_MAINWINDOW_DESKTOP_H__
|
||||
|
||||
#ifdef KDEPIM_MOBILE_UI
|
||||
# include "mainwindow_mobile.h"
|
||||
#else
|
||||
# include "mainwindow_desktop.h"
|
||||
#endif
|
||||
#include <KXmlGuiWindow>
|
||||
|
||||
#endif /* __KLEOPATRA_MAINWINDOW_H__ */
|
||||
#include <utils/pimpl_ptr.h>
|
||||
|
||||
class MainWindow : public KXmlGuiWindow {
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit MainWindow( QWidget * parent=0, Qt::WindowFlags f=KDE_DEFAULT_WINDOWFLAGS );
|
||||
~MainWindow();
|
||||
|
||||
public Q_SLOTS:
|
||||
void importCertificatesFromFile( const QStringList & files );
|
||||
|
||||
protected:
|
||||
QByteArray savedGeometry;
|
||||
|
||||
void closeEvent( QCloseEvent * e );
|
||||
void showEvent( QShowEvent * e );
|
||||
void hideEvent( QHideEvent * e );
|
||||
void dragEnterEvent( QDragEnterEvent * );
|
||||
void dropEvent( QDropEvent * );
|
||||
void readProperties( const KConfigGroup & cg );
|
||||
void saveProperties( KConfigGroup & cg );
|
||||
|
||||
private:
|
||||
class Private;
|
||||
kdtools::pimpl_ptr<Private> d;
|
||||
Q_PRIVATE_SLOT( d, void closeAndQuit() )
|
||||
Q_PRIVATE_SLOT( d, void selfTest() )
|
||||
Q_PRIVATE_SLOT( d, void configureBackend() )
|
||||
Q_PRIVATE_SLOT( d, void configureToolbars() )
|
||||
Q_PRIVATE_SLOT( d, void editKeybindings() )
|
||||
Q_PRIVATE_SLOT( d, void gnupgLogViewer() )
|
||||
Q_PRIVATE_SLOT( d, void gnupgAdministrativeConsole() )
|
||||
Q_PRIVATE_SLOT( d, void slotConfigCommitted() )
|
||||
Q_PRIVATE_SLOT( d, void slotContextMenuRequested(QAbstractItemView*,QPoint) )
|
||||
Q_PRIVATE_SLOT( d, void aboutGpg4Win() )
|
||||
Q_PRIVATE_SLOT( d, void slotFocusQuickSearch() )
|
||||
};
|
||||
|
||||
|
||||
#endif /* __KLEOPATRA_MAINWINDOW_DESKTOP_H__ */
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
/* -*- mode: c++; c-basic-offset:4 -*-
|
||||
mainwindow_desktop.h
|
||||
|
||||
This file is part of Kleopatra, the KDE keymanager
|
||||
Copyright (c) 2007 Klarälvdalens Datakonsult AB
|
||||
|
||||
Kleopatra 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 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Kleopatra 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, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
In addition, as a special exception, the copyright holders give
|
||||
permission to link the code of this program with any edition of
|
||||
the Qt library by Trolltech AS, Norway (or with modified versions
|
||||
of Qt that use the same license as Qt), and distribute linked
|
||||
combinations including the two. You must obey the GNU General
|
||||
Public License in all respects for all of the code used other than
|
||||
Qt. If you modify this file, you may extend this exception to
|
||||
your version of the file, but you are not obligated to do so. If
|
||||
you do not wish to do so, delete this exception statement from
|
||||
your version.
|
||||
*/
|
||||
|
||||
#ifndef __KLEOPATRA_MAINWINDOW_DESKTOP_H__
|
||||
#define __KLEOPATRA_MAINWINDOW_DESKTOP_H__
|
||||
|
||||
#include <KXmlGuiWindow>
|
||||
|
||||
#include <utils/pimpl_ptr.h>
|
||||
|
||||
class MainWindow : public KXmlGuiWindow {
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit MainWindow( QWidget * parent=0, Qt::WindowFlags f=KDE_DEFAULT_WINDOWFLAGS );
|
||||
~MainWindow();
|
||||
|
||||
public Q_SLOTS:
|
||||
void importCertificatesFromFile( const QStringList & files );
|
||||
|
||||
protected:
|
||||
QByteArray savedGeometry;
|
||||
|
||||
void closeEvent( QCloseEvent * e );
|
||||
void showEvent( QShowEvent * e );
|
||||
void hideEvent( QHideEvent * e );
|
||||
void dragEnterEvent( QDragEnterEvent * );
|
||||
void dropEvent( QDropEvent * );
|
||||
void readProperties( const KConfigGroup & cg );
|
||||
void saveProperties( KConfigGroup & cg );
|
||||
|
||||
private:
|
||||
class Private;
|
||||
kdtools::pimpl_ptr<Private> d;
|
||||
Q_PRIVATE_SLOT( d, void closeAndQuit() )
|
||||
Q_PRIVATE_SLOT( d, void selfTest() )
|
||||
Q_PRIVATE_SLOT( d, void configureBackend() )
|
||||
Q_PRIVATE_SLOT( d, void configureToolbars() )
|
||||
Q_PRIVATE_SLOT( d, void editKeybindings() )
|
||||
Q_PRIVATE_SLOT( d, void gnupgLogViewer() )
|
||||
Q_PRIVATE_SLOT( d, void gnupgAdministrativeConsole() )
|
||||
Q_PRIVATE_SLOT( d, void slotConfigCommitted() )
|
||||
Q_PRIVATE_SLOT( d, void slotContextMenuRequested(QAbstractItemView*,QPoint) )
|
||||
Q_PRIVATE_SLOT( d, void aboutGpg4Win() )
|
||||
Q_PRIVATE_SLOT( d, void slotFocusQuickSearch() )
|
||||
};
|
||||
|
||||
|
||||
#endif /* __KLEOPATRA_MAINWINDOW_DESKTOP_H__ */
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
#include <utils/getpid.h>
|
||||
|
||||
#include <libkleopatraclient/core/command.h>
|
||||
#include <libkleopatraclient/core/kleocommand.h>
|
||||
|
||||
#include <QTextDocument> // for Qt::escape
|
||||
#include <QEventLoop>
|
||||
|
|
|
|||
|
|
@ -10,26 +10,6 @@ add_definitions(
|
|||
-DKCAL_DEPRECATED_EXPORT=KCAL_EXPORT
|
||||
)
|
||||
|
||||
# taken from Akonadi which took it from FindQt4.cmake to add additional includes, should probably be merged back there
|
||||
MACRO(QT4_ADD_DBUS_INTERFACE2 _sources _interface _basename _include)
|
||||
GET_FILENAME_COMPONENT(_infile ${_interface} ABSOLUTE)
|
||||
SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
|
||||
SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
|
||||
SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
|
||||
SET(_params -m -i ${_include} -p)
|
||||
|
||||
ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
|
||||
COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} ${_params} ${_basename} ${_infile}
|
||||
DEPENDS ${_infile})
|
||||
|
||||
SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE)
|
||||
|
||||
QT4_GENERATE_MOC(${_header} ${_moc})
|
||||
|
||||
SET(${_sources} ${${_sources}} ${_impl} ${_header} ${_moc})
|
||||
MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc})
|
||||
ENDMACRO(QT4_ADD_DBUS_INTERFACE2)
|
||||
|
||||
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
|
||||
|
||||
add_subdirectory( blog )
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue