Git commit 0c4dee5cef106cb6311d760656fdf419be161eff by Frank Osterfeld. Committed on 24/02/2012 at 16:25. Pushed by osterfeld into branch 'akregator_port'. Move remaining UI classes to akregator. Delete now obsolete netfeedcreatedialog. M +0 -8 krss/CMakeLists.txt D +0 -97 krss/ui/feedpropertiesdialog.cpp D +0 -56 krss/ui/feedpropertiesdialog.h D +0 -342 krss/ui/feedpropertiesdialog.ui D +0 -66 krss/ui/netfeedcreatedialog.cpp D +0 -51 krss/ui/netfeedcreatedialog.h D +0 -62 krss/ui/netfeedcreatedialog.ui http://commits.kde.org/kdepimlibs/0c4dee5cef106cb6311d760656fdf419be161eff diff --git a/krss/CMakeLists.txt b/krss/CMakeLists.txt index 5395d84..1cd3239 100644 --- a/krss/CMakeLists.txt +++ b/krss/CMakeLists.txt @@ -22,8 +22,6 @@ set(krss_LIB_SRCS feedcollection.cpp helper.cpp feeditemmodel.cpp -# ui stuff - ui/feedpropertiesdialog.cpp ) = if(KRSS_ENABLE_PROTOBUF_SERIALIZER) @@ -68,16 +66,10 @@ set(krss_LIB_HDRS rssitem.h #TODO review if rssitem.h should be private ) = -set(krss_UI_LIB_HDRS - ui/feedpropertiesdialog.h -) - set(krss_PRIVATE_LIB_HDRS rssitemserializer.h ) = -kde4_add_ui_files(krss_LIB_SRCS ui/netfeedcreatedialog.ui ui/feedpropertie= sdialog.ui) - kde4_add_library(krss ${LIBRARY_TYPE} ${krss_LIB_SRCS}) = if(KRSS_ENABLE_PROTOBUF_SERIALIZER) diff --git a/krss/ui/feedpropertiesdialog.cpp b/krss/ui/feedpropertiesdialo= g.cpp deleted file mode 100644 index dcc80c7..0000000 --- a/krss/ui/feedpropertiesdialog.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/* - Copyright (C) 2008 Dmitry Ivanov - - This program 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. - - This program 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, see . -*/ - -#include "feedpropertiesdialog.h" -#include "ui_feedpropertiesdialog.h" - -#include - -using namespace KRss; - -namespace KRss { - -class FeedPropertiesDialogPrivate -{ -public: - - Ui::FeedPropertiesDialog m_ui; -}; - -} // namespace KRss - -FeedPropertiesDialog::FeedPropertiesDialog( QWidget *parent ) - : KDialog( parent ), d( new FeedPropertiesDialogPrivate() ) -{ - QWidget *widget =3D new QWidget( this ); - d->m_ui.setupUi( widget ); - - connect( d->m_ui.updateCheck, SIGNAL( toggled( bool ) ), - d->m_ui.updateLabel, SLOT( setEnabled( bool ) ) ); - connect( d->m_ui.updateCheck, SIGNAL( toggled( bool ) ), - d->m_ui.updateInput, SLOT( setEnabled( bool ) ) ); - - setMainWidget( widget ); - setCaption( i18n( "Feed Properties" ) ); - setButtons( KDialog::Ok | KDialog::Cancel ); -} - -FeedPropertiesDialog::~FeedPropertiesDialog() -{ - delete d; -} - -QString FeedPropertiesDialog::feedTitle() const -{ - return d->m_ui.feedTitleEdit->text(); -} - -void FeedPropertiesDialog::setFeedTitle( const QString &feedTitle ) -{ - d->m_ui.feedTitleEdit->setText( feedTitle ); -} - -QString FeedPropertiesDialog::url() const -{ - return d->m_ui.urlEdit->text(); -} - -void FeedPropertiesDialog::setUrl( const QString &url ) -{ - d->m_ui.urlEdit->setText( url ); -} - -bool FeedPropertiesDialog::hasCustomFetchInterval() const -{ - return d->m_ui.updateCheck->isChecked(); -} - -void FeedPropertiesDialog::setCustomFetchInterval( bool enable ) -{ - d->m_ui.updateCheck->setChecked( enable ); -} - -int FeedPropertiesDialog::fetchInterval() const -{ - return d->m_ui.updateInput->value(); -} - -void FeedPropertiesDialog::setFetchInterval( int minutes ) -{ - return d->m_ui.updateInput->setValue( minutes ); -} - -#include "feedpropertiesdialog.moc" diff --git a/krss/ui/feedpropertiesdialog.h b/krss/ui/feedpropertiesdialog.h deleted file mode 100644 index 0449769..0000000 --- a/krss/ui/feedpropertiesdialog.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - Copyright (C) 2008 Dmitry Ivanov - - This program 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. - - This program 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, see . -*/ - -#ifndef KRSS_FEEDPROPERTIESDIALOG_H -#define KRSS_FEEDPROPERTIESDIALOG_H - -#include "krss/krss_export.h" - -#include - -namespace KRss { - -class FeedPropertiesDialogPrivate; - -class KRSS_EXPORT FeedPropertiesDialog : public KDialog -{ - Q_OBJECT - -public: - - explicit FeedPropertiesDialog( QWidget *parent =3D 0 ); - ~FeedPropertiesDialog(); - - QString feedTitle() const; - void setFeedTitle( const QString &feedTitle ); - QString url() const; - void setUrl( const QString &url ); - - bool hasCustomFetchInterval() const; - void setCustomFetchInterval( bool enable ); - int fetchInterval() const; - void setFetchInterval( int minutes ); - -private: - - Q_DISABLE_COPY( FeedPropertiesDialog ) - FeedPropertiesDialogPrivate * const d; -}; - -} // namespace KRss - -#endif // KRSS_FEEDPROPERTIESDIALOG_H diff --git a/krss/ui/feedpropertiesdialog.ui b/krss/ui/feedpropertiesdialog= .ui deleted file mode 100644 index 92ce0b6..0000000 --- a/krss/ui/feedpropertiesdialog.ui +++ /dev/null @@ -1,342 +0,0 @@ - - FeedPropertiesDialog - - - - 0 - 0 - 409 - 212 - - - - - 0 - 0 - - - - Feed Properties - - - - 8 - - - 6 - - - - - - 0 - 0 - - - - 0 - - - - &General - - - - 8 - - - 6 - - - - - U&se a custom update interval - - - - - - - 6 - - - QLayout::SetDefaultConstraint - - - 0 - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 20 - - - - - - - - false - - - Update &every: - - - updateInput - - - - - - - false - - - - 0 - 0 - - - - - - - 0 - - - 0 - - - minutes - - - Never - - - - - - - - - 0 - - - 6 - - - - - &URL: - - - urlEdit - - - - - - - &Title: - - - feedTitleEdit - - - - - - - - 1 - 0 - - - - Display name of RSS column - - - - - - - - - - - - - Ar&chive - - - - 8 - - - 6 - - - - - &Use default settings - - - true - - - - - - - 6 - - - 0 - - - - - 6 - - - 0 - - - - - 6 - - - 0 - - - - - Limit archi&ve to: - - - - - - - false - - - 1 article - - - articles - - - - - - - - - 6 - - - 0 - - - - - &Delete articles older than: - - - - - - - false - - - 1 day - - - days - - - 1 - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 99 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - &Keep all articles - - - - - - - - - - - qPixmapFromMimeSource - - - KIntNumInput - QWidget -

knuminput.h

- - - KIntSpinBox - QSpinBox -

knuminput.h

- - - KLineEdit - QLineEdit -

klineedit.h

- - - - - diff --git a/krss/ui/netfeedcreatedialog.cpp b/krss/ui/netfeedcreatedialog.= cpp deleted file mode 100644 index 1623642..0000000 --- a/krss/ui/netfeedcreatedialog.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* - Copyright (C) 2008 Dmitry Ivanov - - This program 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. - - This program 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, see . -*/ - -#include "netfeedcreatedialog.h" - -#include - -#include - -using namespace KRss; - -NetFeedCreateDialog::NetFeedCreateDialog( QWidget *parent ) - : KDialog( parent ) -{ - QWidget *widget =3D new QWidget( this ); - ui.setupUi( widget ); - - setMainWidget( widget ); - setCaption( i18n( "New feed" ) ); - setButtons( KDialog::Ok | KDialog::Cancel ); -} - -NetFeedCreateDialog::~NetFeedCreateDialog() -{ -} - -void NetFeedCreateDialog::setResourceDescriptions( const QList > &resourceDescriptions ) -{ - // for some unknown reason Q_FOREACH doesn't compile - QListIterator > it_description( resourceDescri= ptions ); - while ( it_description.hasNext() ) { - QPair description =3D it_description.next(); - ui.resourceCombo->addItem( description.second, description.first ); - } -} - -QString NetFeedCreateDialog::url() const -{ - return ui.urlEdit->text(); -} - -QString NetFeedCreateDialog::resourceIdentifier() const -{ - return ui.resourceCombo->itemData( ui.resourceCombo->currentIndex() ).= toString(); -} - -QSize NetFeedCreateDialog::sizeHint() const -{ - return QSize( 342, 72 ); -} - -#include "netfeedcreatedialog.moc" diff --git a/krss/ui/netfeedcreatedialog.h b/krss/ui/netfeedcreatedialog.h deleted file mode 100644 index 70753ce..0000000 --- a/krss/ui/netfeedcreatedialog.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - Copyright (C) 2008 Dmitry Ivanov - - This program 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. - - This program 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, see . -*/ - -#ifndef KRSS_NETFEEDCREATEDIALOG_H -#define KRSS_NETFEEDCREATEDIALOG_H - -#include "krss/krss_export.h" -#include "ui_netfeedcreatedialog.h" - -#include - -namespace KRss { - -class KRSS_EXPORT NetFeedCreateDialog : public KDialog -{ - Q_OBJECT - -public: - - explicit NetFeedCreateDialog( QWidget *parent =3D 0 ); - ~NetFeedCreateDialog(); - - void setResourceDescriptions( const QList > &r= esourceDescriptions ); - - QString url() const; - QString resourceIdentifier() const; - - QSize sizeHint() const; - -private: - - Ui::NetFeedCreateDialog ui; -}; - -} // namespace KRss - -#endif // KRSS_NETFEEDCREATEDIALOG_H diff --git a/krss/ui/netfeedcreatedialog.ui b/krss/ui/netfeedcreatedialog.ui deleted file mode 100644 index 0f90e1b..0000000 --- a/krss/ui/netfeedcreatedialog.ui +++ /dev/null @@ -1,62 +0,0 @@ - - NetFeedCreateDialog - - - - 0 - 0 - 342 - 72 - - - - - 0 - 0 - - - - - - - Feed url - - - - - - - - - - true - - - - - - - Resource - - - - - - - - - - - KComboBox - QComboBox -

kcombobox.h

- - - KLineEdit - QLineEdit -

klineedit.h

- - - - -