Dialog   Dialog 
#include "../../plasma/dialog.h" #include "../../sonnet/dialog.h"
 End of changes. 1 change blocks. 
lines changed or deleted lines changed or added


 dialog.h   dialog.h 
// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*-
/* /*
* dialog.h * Copyright 2008 by Alessandro Diaferia <alediaferia@gmail.com>
* * Copyright 2007 by Alexis Ménard <darktears31@gmail.com>
* Copyright (C) 2003 Zack Rusin <zack@kde.org> * Copyright 2007 Sebastian Kuegler <sebas@kde.org>
* Copyright (C) 2009-2010 Michel Ludwig <michel.ludwig@kdemail.net> * Copyright 2006 Aaron Seigo <aseigo@kde.org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version. * version 2.1 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * Foundation, Inc., 51 Franklin St, Fifth Floor,
* 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
#ifndef SONNET_DIALOG_H
#define SONNET_DIALOG_H
#include <kdialog.h> #ifndef PLASMA_DIALOG_H
#define PLASMA_DIALOG_H
#include <QtGui/QWidget>
#include <QtGui/QGraphicsSceneEvent>
#include <QtGui/QGraphicsView>
class QListWidgetItem; #include <plasma/plasma_export.h>
class QModelIndex; #include <plasma/plasma.h>
namespace Sonnet namespace Plasma
{ {
class BackgroundChecker;
/** class DialogPrivate;
* @short Spellcheck dialog
* /**
* \code * @class Dialog plasma/dialog.h <Plasma/Dialog>
* Sonnet::Dialog dlg = new Sonnet::Dialog( *
* new Sonnet::BackgroundChecker(this), this); * @short A dialog that uses the Plasma style
* //connect signals *
* ... * Dialog provides a dialog-like widget that can be used to display additio
* dlg->setBuffer( someText ); nal
* dlg->show(); * information.
* \endcode *
* * Dialog uses the plasma theme, and usually has no window decoration. It's
* You can change buffer inside a slot connected to done() signal meant
* and spellcheck will continue with new data automatically. * as an interim solution to display widgets as extension to plasma applets
*/ , for
class KDEUI_EXPORT Dialog : public KDialog * example when you click on an applet like the devicenotifier or the clock
{ , the
Q_OBJECT * widget that is then displayed, is a Dialog.
*/
class PLASMA_EXPORT Dialog : public QWidget
{
Q_OBJECT
public: public:
Dialog(BackgroundChecker *checker, /**
QWidget *parent); * Use these flags to choose the active resize corners.
~Dialog(); */
enum ResizeCorner {
QString originalBuffer() const; NoCorner = 0,
QString buffer() const; NorthEast = 1,
SouthEast = 2,
void show(); NorthWest = 4,
void activeAutoCorrect(bool _active); SouthWest = 8,
All = NorthEast | SouthEast | NorthWest | SouthWest
// Hide warning about done(), which is a slot in QDialog and a sign };
al here. Q_DECLARE_FLAGS(ResizeCorners, ResizeCorner)
using KDialog::done;
/**
/** * @param parent the parent widget, for plasmoids, this is usually
* Controls whether an (indefinite) progress dialog is shown when t 0.
he spell * @param f the Qt::WindowFlags, default is to not show a windowbor
* checking takes longer than the given time to complete. By defaul der.
t no */
* progress dialog is shown. If the progress dialog is set to be sh explicit Dialog(QWidget * parent = 0, Qt::WindowFlags f = Qt::Wind
own, no ow);
* time consuming operation (for example, showing a notification me virtual ~Dialog();
ssage) should
* be performed in a slot connected to the 'done' signal as this mi /**
ght trigger * Sets a QGraphicsWidget to be shown as the content in this dialog
* the progress dialog unnecessarily. .
* The dialog will then set up a QGraphicsView and coordinate geome
try with
* the widget automatically.
* *
* @param timeout time after which the progress dialog should appea * @param widget the QGraphicsWidget to display in this dialog
r; a negative
* value can be used to hide it
* @since 4.4
*/ */
void showProgressDialog(int timeout = 500); void setGraphicsWidget(QGraphicsWidget *widget);
/** /**
* Controls whether a message box indicating the completion of the * @return the graphics widget shown in this dialog
spell checking */
* is shown or not. By default it is not shown. QGraphicsWidget *graphicsWidget();
/**
* @param corners the corners the resize handlers should be placed
in.
*/
void setResizeHandleCorners(ResizeCorners corners);
/**
* Convenience method to get the enabled resize corners.
* @return which resize corners are active.
*/
ResizeCorners resizeCorners() const;
/**
* @return true if currently being resized by the user
*/
bool isUserResizing() const;
/**
* Sets the minimum values that each of four sides of the rect may
expand to or from
* *
* @since 4.4 * @param left the screen coordinate that the left may not go beyon
d; -1 for no limit
* @param top the screen coordinate that the top may not go beyond;
-1 for no limit
* @param right the screen coordinate that the right may not go bey
ond; -1 for no limit
* @param bottom the screen coordinate that the bottom may not go b
eyond; -1 for no limit
*/ */
void showSpellCheckCompletionMessage( bool b = true ); void setMinimumResizeLimits(int left, int top, int right, int botto m);
/** /**
* Controls whether the spell checking is continued after the repla * Retrives the minimum resize limits for the dialog
cement of a
* misspelled word has been performed. By default it is continued.
* *
* @param left the screen coordinate that the left may not go beyon
d; -1 for no limit
* @param top the screen coordinate that the top may not go beyond;
-1 for no limit
* @param right the screen coordinate that the right may not go bey
ond; -1 for no limit
* @param bottom the screen coordinate that the bottom may not go b
eyond; -1 for no limit
*/
void getMinimumResizeLimits(int *left, int *top, int *right, int *b
ottom);
/**
* Causes an animated hide; requires compositing to work, otherwise
* the dialog will simply hide.
* @since 4.3
*/
void animatedHide(Plasma::Direction direction);
/**
* Causes an animated show; requires compositing to work, otherwise
* the dialog will simply show.
* @since 4.3
*/
void animatedShow(Plasma::Direction direction);
/**
* @return the preferred aspect ratio mode for placement and resizi
ng
* @since 4.4 * @since 4.4
*/ */
void setSpellCheckContinuedAfterReplacement( bool b ); Plasma::AspectRatioMode aspectRatioMode() const;
public Q_SLOTS: /**
void setBuffer(const QString &); * Sets the preferred aspect ratio mode for placement and resizing
* @since 4.4
*/
void setAspectRatioMode(Plasma::AspectRatioMode mode);
Q_SIGNALS: Q_SIGNALS:
/** /**
* The dialog won't be closed if you setBuffer() in slot connected * Fires when the dialog automatically resizes.
to this signal
*
* Also emitted after stop() signal
*/ */
void done( const QString& newBuffer ); void dialogResized();
void misspelling( const QString& word, int start );
void replace( const QString& oldWord, int start,
const QString& newWord );
void stop();
void cancel();
void autoCorrect( const QString & currentWord, const QString & repl
aceWord );
/** /**
* Signal sends when spell checking is finished/stopped/completed * Emit a signal when the dialog become visible/invisible
* @since 4.1
*/ */
void spellCheckStatus(const QString &); void dialogVisible(bool status);
public Q_SLOTS:
/** /**
* Emitted when the user changes the language used for spellcheckin * Adjusts the dialog to the associated QGraphicsWidget's geometry
g, * Should not normally need to be called by users of Dialog as Dial
* which is shown in a combobox of this dialog. og
* * does it automatically. Event compression may cause unwanted dela
* @param dictionary the new language the user selected ys,
* @since 4.1 * however, and so this method may be called to immediately cause a
* synchronization.
* @since 4.5
*/
void syncToGraphicsWidget();
protected:
/**
* Reimplemented from QWidget
*/
void paintEvent(QPaintEvent *e);
bool event(QEvent *event);
void resizeEvent(QResizeEvent *e);
bool eventFilter(QObject *watched, QEvent *event);
void hideEvent(QHideEvent *event);
void showEvent(QShowEvent *event);
void focusInEvent(QFocusEvent *event);
void mouseMoveEvent(QMouseEvent *event);
void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void keyPressEvent(QKeyEvent *event);
void moveEvent(QMoveEvent *event);
/**
* Convenience method to know whether the point is in a control are
a (e.g. resize area)
* or not.
* @return true if the point is in the control area.
*/ */
void languageChanged( const QString &language ); bool inControlArea(const QPoint &point);
private Q_SLOTS: private:
void slotMisspelling(const QString& word, int start ); DialogPrivate *const d;
void slotDone();
friend class DialogPrivate;
void slotFinished(); /**
void slotCancel(); * React to theme changes
*/
void slotAddWord(); Q_PRIVATE_SLOT(d, void themeChanged())
void slotReplaceWord(); Q_PRIVATE_SLOT(d, void checkBorders())
void slotReplaceAll(); Q_PRIVATE_SLOT(d, void delayedAdjustSize())
void slotSkip();
void slotSkipAll();
void slotSuggest();
void slotChangeLanguage( const QString& );
void slotSelectionChanged(const QModelIndex &);
void slotAutocorrect();
void setGuiEnabled(bool b); friend class PopupAppletPrivate;
void setProgressDialogVisible(bool b); };
private: } // Plasma namespace
void updateDialog( const QString& word );
void fillDictionaryComboBox();
void updateDictionaryComboBox();
void fillSuggestions( const QStringList& suggs );
void initConnections();
void initGui();
void continueChecking();
private: Q_DECLARE_OPERATORS_FOR_FLAGS(Plasma::Dialog::ResizeCorners)
class Private;
Private* const d;
Q_DISABLE_COPY( Dialog )
};
}
#endif #endif
 End of changes. 30 change blocks. 
129 lines changed or deleted 190 lines changed or added


 kcombobox.h   kcombobox.h 
skipping to change at line 74 skipping to change at line 74
* explicitly use setCompletionObject( KCompletion*, bool ) to assign your * explicitly use setCompletionObject( KCompletion*, bool ) to assign your
* own completion object. Additionally, to make this widget more functiona l, * own completion object. Additionally, to make this widget more functiona l,
* KComboBox will by default handle text rotation and completion events * KComboBox will by default handle text rotation and completion events
* internally whenever a completion object is created through either one of the * internally whenever a completion object is created through either one of the
* methods mentioned above. If you do not need this functionality, simply use * methods mentioned above. If you do not need this functionality, simply use
* KCompletionBase::setHandleSignals(bool) or alternatively set the boolean * KCompletionBase::setHandleSignals(bool) or alternatively set the boolean
* parameter in the @p setCompletionObject call to false. * parameter in the @p setCompletionObject call to false.
* *
* Beware: The completion object can be deleted on you, especially if a cal l * Beware: The completion object can be deleted on you, especially if a cal l
* such as setEditable(false) is made. Store the pointer at your own risk, * such as setEditable(false) is made. Store the pointer at your own risk,
* and consider using QGuardedPtr<KCompletion>. * and consider using QPointer<KCompletion>.
* *
* The default key-bindings for completion and rotation is determined from the * The default key-bindings for completion and rotation is determined from the
* global settings in KStandardShortcut. These values, however, can be over ridden * global settings in KStandardShortcut. These values, however, can be over ridden
* locally by invoking KCompletionBase::setKeyBinding(). The values can * locally by invoking KCompletionBase::setKeyBinding(). The values can
* easily be reverted back to the default setting, by simply calling * easily be reverted back to the default setting, by simply calling
* useGlobalSettings(). An alternate method would be to default individual * useGlobalSettings(). An alternate method would be to default individual
* key-bindings by usning setKeyBinding() with the default second argument. * key-bindings by usning setKeyBinding() with the default second argument.
* *
* A non-editable combobox only has one completion mode, @p CompletionAuto. * A non-editable combobox only has one completion mode, @p CompletionAuto.
* Unlike an editable combobox the CompletionAuto mode, works by matching * Unlike an editable combobox the CompletionAuto mode, works by matching
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 kdeversion.h   kdeversion.h 
skipping to change at line 47 skipping to change at line 47
* This macro contains the KDE version in string form. As it is a macro, * This macro contains the KDE version in string form. As it is a macro,
* it contains the version at compile time. See versionString() if you need * it contains the version at compile time. See versionString() if you need
* the KDE version used at runtime. * the KDE version used at runtime.
* *
* @note The version string might contain a section in parentheses, * @note The version string might contain a section in parentheses,
* especially for development versions of KDE. * especially for development versions of KDE.
* If you use that macro directly for a file format (e.g. OASIS Open Docume nt) * If you use that macro directly for a file format (e.g. OASIS Open Docume nt)
* or for a protocol (e.g. http) be careful that it is appropriate. * or for a protocol (e.g. http) be careful that it is appropriate.
* (Fictional) example: "4.0.90 (>=20070101)" * (Fictional) example: "4.0.90 (>=20070101)"
*/ */
#define KDE_VERSION_STRING "4.11.2" #define KDE_VERSION_STRING "4.11.3"
/** /**
* @def KDE_VERSION_MAJOR * @def KDE_VERSION_MAJOR
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Major version of KDE, at compile time * @brief Major version of KDE, at compile time
*/ */
#define KDE_VERSION_MAJOR 4 #define KDE_VERSION_MAJOR 4
/** /**
* @def KDE_VERSION_MINOR * @def KDE_VERSION_MINOR
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Minor version of KDE, at compile time * @brief Minor version of KDE, at compile time
*/ */
#define KDE_VERSION_MINOR 11 #define KDE_VERSION_MINOR 11
/** /**
* @def KDE_VERSION_RELEASE * @def KDE_VERSION_RELEASE
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Release version of KDE, at compile time * @brief Release version of KDE, at compile time
*/ */
#define KDE_VERSION_RELEASE 2 #define KDE_VERSION_RELEASE 3
/** /**
* @ingroup KDEMacros * @ingroup KDEMacros
* @brief Make a number from the major, minor and release number of a KDE v ersion * @brief Make a number from the major, minor and release number of a KDE v ersion
* *
* This function can be used for preprocessing when KDE_IS_VERSION is not * This function can be used for preprocessing when KDE_IS_VERSION is not
* appropriate. * appropriate.
*/ */
#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/