[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim/akregator_port] /: Move remaining UI classes to akregator.
From: Frank Osterfeld <frank.osterfeld () kdab ! com>
Date: 2012-02-24 15:27:00
Message-ID: 20120224152700.0AC52A60B9 () git ! kde ! org
[Download RAW message or body]
Git commit d361d461287d00440334735e0b9c90415f3f581a 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 +2 -1 akregator2/src/CMakeLists.txt
M +1 -1 akregator2/src/editfeedcommand.cpp
R +0 -0 akregator2/src/feedpropertiesdialog.cpp [from: \
krss/krss/ui/feedpropertiesdialog.cpp - 100% similarity] R +1 -3 \
akregator2/src/feedpropertiesdialog.h [from: krss/krss/ui/feedpropertiesdialog.h - \
094% similarity] R +0 -0 akregator2/src/feedpropertiesdialog.ui [from: \
krss/krss/ui/feedpropertiesdialog.ui - 100% similarity] M +0 -8 \
krss/krss/CMakeLists.txt D +0 -66 krss/krss/ui/netfeedcreatedialog.cpp
D +0 -51 krss/krss/ui/netfeedcreatedialog.h
D +0 -62 krss/krss/ui/netfeedcreatedialog.ui
http://commits.kde.org/kdepim/d361d461287d00440334735e0b9c90415f3f581a
diff --git a/akregator2/src/CMakeLists.txt b/akregator2/src/CMakeLists.txt
index 387914f..cec3657 100644
--- a/akregator2/src/CMakeLists.txt
+++ b/akregator2/src/CMakeLists.txt
@@ -62,6 +62,7 @@ set(akregator2part_PART_SRCS
# deletesubscriptioncommand.cpp
feediconmanager.cpp
feedlistview.cpp
+ feedpropertiesdialog.cpp
pluginmanager.cpp
selectioncontroller.cpp
utils.cpp
@@ -100,7 +101,7 @@ qt4_add_dbus_adaptor( akregator2part_PART_SRCS \
org.kde.akregator2.part.xml akreg
kde4_add_ui_files(akregator2part_PART_SRCS
- addfeedwidgetbase.ui
+ addfeedwidgetbase.ui feedpropertiesdialog.ui
)
kde4_add_plugin(akregator2part ${akregator2part_PART_SRCS})
diff --git a/akregator2/src/editfeedcommand.cpp b/akregator2/src/editfeedcommand.cpp
index 8b3b645..89ddad7 100644
--- a/akregator2/src/editfeedcommand.cpp
+++ b/akregator2/src/editfeedcommand.cpp
@@ -24,9 +24,9 @@
#include "editfeedcommand.h"
#include "command_p.h"
+#include "feedpropertiesdialog.h"
#include <krss/feedcollection.h>
-#include <krss/ui/feedpropertiesdialog.h>
#include <Akonadi/Collection>
#include <Akonadi/CollectionFetchJob>
diff --git a/krss/krss/ui/feedpropertiesdialog.cpp \
b/akregator2/src/feedpropertiesdialog.cpp similarity index 100%
rename from krss/krss/ui/feedpropertiesdialog.cpp
rename to akregator2/src/feedpropertiesdialog.cpp
diff --git a/krss/krss/ui/feedpropertiesdialog.h \
b/akregator2/src/feedpropertiesdialog.h similarity index 94%
rename from krss/krss/ui/feedpropertiesdialog.h
rename to akregator2/src/feedpropertiesdialog.h
index 0449769..ae0318f 100644
--- a/krss/krss/ui/feedpropertiesdialog.h
+++ b/akregator2/src/feedpropertiesdialog.h
@@ -18,15 +18,13 @@
#ifndef KRSS_FEEDPROPERTIESDIALOG_H
#define KRSS_FEEDPROPERTIESDIALOG_H
-#include "krss/krss_export.h"
-
#include <KDialog>
namespace KRss {
class FeedPropertiesDialogPrivate;
-class KRSS_EXPORT FeedPropertiesDialog : public KDialog
+class FeedPropertiesDialog : public KDialog
{
Q_OBJECT
diff --git a/krss/krss/ui/feedpropertiesdialog.ui \
b/akregator2/src/feedpropertiesdialog.ui similarity index 100%
rename from krss/krss/ui/feedpropertiesdialog.ui
rename to akregator2/src/feedpropertiesdialog.ui
diff --git a/krss/krss/CMakeLists.txt b/krss/krss/CMakeLists.txt
index 5395d84..1cd3239 100644
--- a/krss/krss/CMakeLists.txt
+++ b/krss/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/feedpropertiesdialog.ui)
-
kde4_add_library(krss ${LIBRARY_TYPE} ${krss_LIB_SRCS})
if(KRSS_ENABLE_PROTOBUF_SERIALIZER)
diff --git a/krss/krss/ui/netfeedcreatedialog.cpp \
b/krss/krss/ui/netfeedcreatedialog.cpp deleted file mode 100644
index 1623642..0000000
--- a/krss/krss/ui/netfeedcreatedialog.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- Copyright (C) 2008 Dmitry Ivanov <vonami@gmail.com>
-
- 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 <http://www.gnu.org/licenses/>.
-*/
-
-#include "netfeedcreatedialog.h"
-
-#include <KLocale>
-
-#include <QtCore/QListIterator>
-
-using namespace KRss;
-
-NetFeedCreateDialog::NetFeedCreateDialog( QWidget *parent )
- : KDialog( parent )
-{
- QWidget *widget = new QWidget( this );
- ui.setupUi( widget );
-
- setMainWidget( widget );
- setCaption( i18n( "New feed" ) );
- setButtons( KDialog::Ok | KDialog::Cancel );
-}
-
-NetFeedCreateDialog::~NetFeedCreateDialog()
-{
-}
-
-void NetFeedCreateDialog::setResourceDescriptions( const QList<QPair<QString, \
QString> > &resourceDescriptions )
-{
- // for some unknown reason Q_FOREACH doesn't compile
- QListIterator<QPair<QString, QString> > it_description( resourceDescriptions );
- while ( it_description.hasNext() ) {
- QPair<QString, QString> description = 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/krss/ui/netfeedcreatedialog.h b/krss/krss/ui/netfeedcreatedialog.h
deleted file mode 100644
index 70753ce..0000000
--- a/krss/krss/ui/netfeedcreatedialog.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- Copyright (C) 2008 Dmitry Ivanov <vonami@gmail.com>
-
- 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 <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef KRSS_NETFEEDCREATEDIALOG_H
-#define KRSS_NETFEEDCREATEDIALOG_H
-
-#include "krss/krss_export.h"
-#include "ui_netfeedcreatedialog.h"
-
-#include <KDialog>
-
-namespace KRss {
-
-class KRSS_EXPORT NetFeedCreateDialog : public KDialog
-{
- Q_OBJECT
-
-public:
-
- explicit NetFeedCreateDialog( QWidget *parent = 0 );
- ~NetFeedCreateDialog();
-
- void setResourceDescriptions( const QList<QPair<QString, QString> > \
&resourceDescriptions );
-
- QString url() const;
- QString resourceIdentifier() const;
-
- QSize sizeHint() const;
-
-private:
-
- Ui::NetFeedCreateDialog ui;
-};
-
-} // namespace KRss
-
-#endif // KRSS_NETFEEDCREATEDIALOG_H
diff --git a/krss/krss/ui/netfeedcreatedialog.ui \
b/krss/krss/ui/netfeedcreatedialog.ui deleted file mode 100644
index 0f90e1b..0000000
--- a/krss/krss/ui/netfeedcreatedialog.ui
+++ /dev/null
@@ -1,62 +0,0 @@
-<ui version="4.0" >
- <class>NetFeedCreateDialog</class>
- <widget class="QWidget" name="NetFeedCreateDialog" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>342</width>
- <height>72</height>
- </rect>
- </property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <layout class="QFormLayout" name="formLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="urlLabel" >
- <property name="text" >
- <string>Feed url</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="KLineEdit" name="urlEdit" >
- <property name="clickMessage" >
- <string/>
- </property>
- <property name="showClearButton" stdset="0" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="resourceLabel" >
- <property name="text" >
- <string>Resource</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="KComboBox" name="resourceCombo" />
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic