diff --git a/Modules/QtWidgetsExt/QmitkLineEdit.cpp b/Modules/QtWidgetsExt/QmitkLineEdit.cpp deleted file mode 100644 index 11e58a4628..0000000000 --- a/Modules/QtWidgetsExt/QmitkLineEdit.cpp +++ /dev/null @@ -1,106 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#include "QmitkLineEdit.h" -#include - -QmitkLineEdit::QmitkLineEdit(QWidget* parent) - : QLineEdit(parent) -{ - this->Initialize(); -} - -QmitkLineEdit::QmitkLineEdit(const QString& defaultText, QWidget* parent) - : QLineEdit(parent), - m_DefaultText(defaultText) -{ - this->Initialize(); -} - -QmitkLineEdit::~QmitkLineEdit() -{ -} - -void QmitkLineEdit::focusInEvent(QFocusEvent* event) -{ - QLineEdit::focusInEvent(event); - emit this->FocusChanged(true); -} - -void QmitkLineEdit::focusOutEvent(QFocusEvent* event) -{ - QLineEdit::focusOutEvent(event); - emit this->FocusChanged(false); -} - -QString QmitkLineEdit::GetDefaultText() const -{ - return m_DefaultText; -} - -void QmitkLineEdit::Initialize() -{ - m_DefaultPalette.setColor(QPalette::Text, QApplication::palette().color(QPalette::Disabled, QPalette::Text)); - - this->ShowDefaultText(true); - - connect(this, SIGNAL(FocusChanged(bool)), this, SLOT(OnFocusChanged(bool))); - connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(OnTextChanged(const QString&))); -} - -void QmitkLineEdit::OnFocusChanged(bool hasFocus) -{ - if (hasFocus) - { - if (this->text() == m_DefaultText && this->palette() == m_DefaultPalette) - this->ShowDefaultText(false); - } - else - { - if (this->text().isEmpty()) - this->ShowDefaultText(true); - } -} - -void QmitkLineEdit::OnTextChanged(const QString&) -{ - if (this->palette() == m_DefaultPalette) - this->setPalette(QPalette()); -} - -void QmitkLineEdit::SetDefaultText(const QString& defaultText) -{ - m_DefaultText = defaultText; -} - -void QmitkLineEdit::ShowDefaultText(bool show) -{ - this->blockSignals(true); - - if (show) - { - this->setPalette(m_DefaultPalette); - this->setText(m_DefaultText); - } - else - { - this->setPalette(QPalette()); - this->clear(); - } - - this->blockSignals(false); -} - diff --git a/Modules/QtWidgetsExt/QmitkLineEdit.h b/Modules/QtWidgetsExt/QmitkLineEdit.h deleted file mode 100644 index 286ccacd35..0000000000 --- a/Modules/QtWidgetsExt/QmitkLineEdit.h +++ /dev/null @@ -1,68 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#ifndef QmitkLineEdit_h -#define QmitkLineEdit_h - -#include -#include -#include - -/** - * \deprecatedSince{2014_03} Use QLineEdit instead - */ -class MitkQtWidgetsExt_EXPORT QmitkLineEdit : public QLineEdit -{ - Q_OBJECT - Q_PROPERTY(QString DefaultText READ GetDefaultText WRITE SetDefaultText FINAL) - -public: - - /** - * \deprecatedSince{2014_03} Use QLineEdit instead - */ - DEPRECATED(explicit QmitkLineEdit(QWidget* parent = NULL)); - /** - * \deprecatedSince{2014_03} Use QLineEdit instead - */ - DEPRECATED(explicit QmitkLineEdit(const QString& defaultText, QWidget* parent = NULL)); - ~QmitkLineEdit(); - - QString GetDefaultText() const; - void SetDefaultText(const QString& defaultText); - -protected: - void focusInEvent(QFocusEvent* event); - void focusOutEvent(QFocusEvent* event); - -private: - void Initialize(); - void ShowDefaultText(bool show); - -signals: - void FocusChanged(bool hasFocus); - -private slots: - void OnFocusChanged(bool hasFocus); - void OnTextChanged(const QString& text); - -private: - QString m_DefaultText; - QPalette m_DefaultPalette; -}; - -#endif - diff --git a/Modules/QtWidgetsExt/files.cmake b/Modules/QtWidgetsExt/files.cmake index 88c3741a44..4b4b557665 100644 --- a/Modules/QtWidgetsExt/files.cmake +++ b/Modules/QtWidgetsExt/files.cmake @@ -1,119 +1,117 @@ set(CPP_FILES QmitkAboutDialog/QmitkAboutDialog.cpp QmitkApplicationBase/QmitkIOUtil.cpp QmitkPropertyObservers/QmitkBasePropertyView.cpp QmitkPropertyObservers/QmitkBoolPropertyWidget.cpp QmitkPropertyObservers/QmitkColorPropertyEditor.cpp QmitkPropertyObservers/QmitkColorPropertyView.cpp QmitkPropertyObservers/QmitkEnumerationPropertyWidget.cpp QmitkPropertyObservers/QmitkNumberPropertyEditor.cpp QmitkPropertyObservers/QmitkNumberPropertySlider.cpp QmitkPropertyObservers/QmitkNumberPropertyView.cpp QmitkPropertyObservers/QmitkPropertyViewFactory.cpp QmitkPropertyObservers/QmitkStringPropertyEditor.cpp QmitkPropertyObservers/QmitkStringPropertyOnDemandEdit.cpp QmitkPropertyObservers/QmitkStringPropertyView.cpp QmitkPropertyObservers/QmitkUGCombinedRepresentationPropertyWidget.cpp qclickablelabel.cpp QmitkBoundingObjectWidget.cpp QmitkCallbackFromGUIThread.cpp QmitkColorTransferFunctionCanvas.cpp QmitkCorrespondingPointSetsModel.cpp QmitkCorrespondingPointSetsView.cpp QmitkCorrespondingPointSetsWidget.cpp QmitkCrossWidget.cpp QmitkEditPointDialog.cpp QmitkFileChooser.cpp QmitkFloatingPointSpanSlider.cpp QmitkGnuplotWidget.cpp QmitkHistogram.cpp QmitkHistogramJSWidget.cpp QmitkHistogramWidget.cpp QmitkHotkeyLineEdit.cpp - QmitkLineEdit.cpp QmitkModulesDialog.cpp QmitkModuleTableModel.cpp QmitkPiecewiseFunctionCanvas.cpp QmitkPlotWidget.cpp QmitkPlotDialog.cpp QmitkPointListModel.cpp QmitkPointListView.cpp QmitkPointListViewWidget.cpp QmitkPointListWidget.cpp QmitkPrimitiveMovieNavigatorWidget.cpp QmitkSelectableGLWidget.cpp QmitkSliceWidget.cpp QmitkSliderNavigatorWidget.cpp QmitkStandardViews.cpp QmitkStepperAdapter.cpp QmitkTransferFunctionCanvas.cpp QmitkTransferFunctionGeneratorWidget.cpp QmitkTransferFunctionWidget.cpp QmitkVideoBackground.cpp QmitkWebPage.cpp QtWidgetsExtRegisterClasses.cpp ) set(MOC_H_FILES QmitkAboutDialog/QmitkAboutDialog.h QmitkPropertyObservers/QmitkBasePropertyView.h QmitkPropertyObservers/QmitkBoolPropertyWidget.h QmitkPropertyObservers/QmitkColorPropertyEditor.h QmitkPropertyObservers/QmitkColorPropertyView.h QmitkPropertyObservers/QmitkEnumerationPropertyWidget.h QmitkPropertyObservers/QmitkNumberPropertyEditor.h QmitkPropertyObservers/QmitkNumberPropertySlider.h QmitkPropertyObservers/QmitkNumberPropertyView.h QmitkPropertyObservers/QmitkStringPropertyEditor.h QmitkPropertyObservers/QmitkStringPropertyOnDemandEdit.h QmitkPropertyObservers/QmitkStringPropertyView.h QmitkPropertyObservers/QmitkUGCombinedRepresentationPropertyWidget.h qclickablelabel.h QmitkBoundingObjectWidget.h QmitkCallbackFromGUIThread.h QmitkColorTransferFunctionCanvas.h QmitkCorrespondingPointSetsModel.h QmitkCorrespondingPointSetsView.h QmitkCorrespondingPointSetsWidget.h QmitkCrossWidget.h QmitkEditPointDialog.h QmitkFileChooser.h QmitkFloatingPointSpanSlider.h QmitkGnuplotWidget.h QmitkHistogramJSWidget.h QmitkHistogramWidget.h QmitkHotkeyLineEdit.h - QmitkLineEdit.h QmitkPiecewiseFunctionCanvas.h QmitkPlotWidget.h QmitkPointListModel.h QmitkPointListView.h QmitkPointListViewWidget.h QmitkPointListWidget.h QmitkPrimitiveMovieNavigatorWidget.h QmitkSelectableGLWidget.h QmitkSliceWidget.h QmitkSliderNavigatorWidget.h QmitkStandardViews.h QmitkStepperAdapter.h QmitkTransferFunctionCanvas.h QmitkTransferFunctionGeneratorWidget.h QmitkTransferFunctionWidget.h QmitkVideoBackground.h QmitkWebPage.h ) set(UI_FILES QmitkAboutDialog/QmitkAboutDialogGUI.ui QmitkGnuplotWidget.ui QmitkPrimitiveMovieNavigatorWidget.ui QmitkSelectableGLWidget.ui QmitkSliceWidget.ui QmitkSliderNavigator.ui QmitkTransferFunctionGeneratorWidget.ui QmitkTransferFunctionWidget.ui ) set(QRC_FILES resources/QtWidgetsExt.qrc )