[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/kipi-plugins/fbexport
From: Luka Renko <lure () kubuntu ! org>
Date: 2009-01-03 17:07:59
Message-ID: 1231002479.688616.23293.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 905092 by lure:
QComboBox -> KComboBox
QPushButton -> KPushButton
Add tooltips to pushbuttons
Use new style for KDE includes
M +6 -6 fbalbum.cpp
M +4 -4 fbalbum.h
M +8 -10 fbtalker.cpp
M +1 -1 fbtalker.h
M +19 -17 fbwidget.cpp
M +7 -7 fbwidget.h
M +15 -15 fbwindow.cpp
M +1 -1 fbwindow.h
M +6 -6 mpform.cpp
M +1 -1 mpform.h
M +8 -8 plugin_fbexport.cpp
M +1 -1 plugin_fbexport.h
--- trunk/extragear/graphics/kipi-plugins/fbexport/fbalbum.cpp #905091:905092
@@ -25,13 +25,13 @@
// Qt includes.
#include <QFormLayout>
-#include <QComboBox>
// KDE includes.
-#include <klocale.h>
-#include <kdialog.h>
-#include <klineedit.h>
-#include <ktextedit.h>
+#include <KLocale>
+#include <KDialog>
+#include <KLineEdit>
+#include <KTextEdit>
+#include <KComboBox>
// local includes
#include <fbitem.h>
@@ -66,7 +66,7 @@
m_descEdt->setWhatsThis(
i18n("Description of the album that will be created (optional)."));
- m_privacyCoB = new QComboBox(mainWidget);
+ m_privacyCoB = new KComboBox(mainWidget);
m_privacyCoB->setEditable(false);
m_privacyCoB->setWhatsThis(
i18n("Privacy setting of the album that will be created (required)."));
--- trunk/extragear/graphics/kipi-plugins/fbexport/fbalbum.h #905091:905092
@@ -6,7 +6,7 @@
* Date : 2008-12-26
* Description : a kipi plugin to export images to Facebook web service
*
- * Copyright (C) 2008 by Luka Renko <lure at kubuntu dot org>
+ * Copyright (C) 2008-2009 by Luka Renko <lure at kubuntu dot org>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -26,11 +26,11 @@
// Qt includes.
// KDE includes.
-#include <kdialog.h>
+#include <KDialog>
-class QComboBox;
class KLineEdit;
class KTextEdit;
+class KComboBox;
namespace KIPIFbExportPlugin
{
@@ -51,7 +51,7 @@
KLineEdit *m_titleEdt;
KLineEdit *m_locEdt;
KTextEdit *m_descEdt;
- QComboBox *m_privacyCoB;
+ KComboBox *m_privacyCoB;
friend class FbWindow;
};
--- trunk/extragear/graphics/kipi-plugins/fbexport/fbtalker.cpp #905091:905092
@@ -23,6 +23,7 @@
#include "fbtalker.h"
#include "fbtalker.moc"
+// C++ includes.
#include <ctime>
// Qt includes.
@@ -32,13 +33,13 @@
#include <QProgressDialog>
// KDE includes.
-#include <kcodecs.h>
-#include <kdebug.h>
-#include <kio/job.h>
-#include <kio/jobuidelegate.h>
-#include <kapplication.h>
-#include <kmessagebox.h>
-#include <ktoolinvocation.h>
+#include <KCodecs>
+#include <KDebug>
+#include <KIO/Job>
+#include <KIO/JobUiDelegate>
+#include <KApplication>
+#include <KMessageBox>
+#include <KToolInvocation>
// Local includes.
#include "pluginsversion.h"
@@ -948,9 +949,6 @@
{
if (!node.isElement())
continue;
-
- kDebug(51000) << "NEW: " << node.nodeName()
- << "=" << node.toElement().text();
}
errCode = 0;
}
--- trunk/extragear/graphics/kipi-plugins/fbexport/fbtalker.h #905091:905092
@@ -30,7 +30,7 @@
#include <QObject>
// KDE includes.
-#include <kio/job.h>
+#include <KIO/Job>
// local includes.
#include "fbitem.h"
--- trunk/extragear/graphics/kipi-plugins/fbexport/fbwidget.cpp #905091:905092
@@ -27,16 +27,16 @@
#include <QLabel>
#include <QSpinBox>
#include <QCheckBox>
-#include <QComboBox>
#include <QGroupBox>
#include <QGridLayout>
#include <QHBoxLayout>
#include <QVBoxLayout>
-#include <QPushButton>
// KDE includes.
-#include <klocale.h>
-#include <kdialog.h>
+#include <KLocale>
+#include <KDialog>
+#include <KComboBox>
+#include <KPushButton>
// LibKIPI includes.
#include <libkipi/interface.h>
@@ -85,12 +85,14 @@
permissionLbl->setWhatsThis(
i18n("Permission of KIPI Plugin application to upload photos directly. If \
not, user will need to manually approve uploaded photos in Facebook.")); \
m_permissionLbl = new QLabel(accountBox);
- m_changeUserBtn = new QPushButton(accountBox);
- m_changeUserBtn->setText(i18n("Change Account"));
- m_changeUserBtn->setIcon(SmallIcon("system-switch-user"));
- m_changePermBtn = new QPushButton(accountBox);
- m_changePermBtn->setText(i18n("Change Permission"));
- m_changePermBtn->setIcon(SmallIcon("security-high"));
+ m_changeUserBtn = new KPushButton(
+ KGuiItem(i18n("Change Account"), "system-switch-user",
+ i18n("Logout and change Facebook Account used for upload")),
+ accountBox);
+ m_changePermBtn = new KPushButton(
+ KGuiItem(i18n("Change Permission"), "security-high",
+ i18n("Change permission for KIPI application for photo upload")),
+ accountBox);
accountBoxLayout->addWidget(userNameLbl, 0, 0, 1, 2);
accountBoxLayout->addWidget(m_userNameDisplayLbl, 0, 2, 1, 2);
@@ -108,14 +110,14 @@
i18n("This is the Facebook album where selected photos will be uploaded."));
QGridLayout* albumsBoxLayout = new QGridLayout(albumsBox);
- m_albumsCoB = new QComboBox(albumsBox);
+ m_albumsCoB = new KComboBox(albumsBox);
m_albumsCoB->setEditable(false);
- m_newAlbumBtn = new QPushButton(accountBox);
- m_newAlbumBtn->setText(i18n("New Album"));
- m_newAlbumBtn->setIcon(SmallIcon("list-add"));
- m_reloadAlbumsBtn = new QPushButton(accountBox);
- m_reloadAlbumsBtn->setText(i18n("Reload"));
- m_reloadAlbumsBtn->setIcon(SmallIcon("view-refresh"));
+ m_newAlbumBtn = new KPushButton(
+ KGuiItem(i18n("New Album"), "list-add",
+ i18n("Create new Facebook album")), accountBox);
+ m_reloadAlbumsBtn = new KPushButton(
+ KGuiItem(i18n("Reload"), "view-refresh",
+ i18n("Reload album list")), accountBox);
albumsBoxLayout->addWidget(m_albumsCoB, 0, 0, 1, 5);
albumsBoxLayout->addWidget(m_newAlbumBtn, 1, 3, 1, 1);
--- trunk/extragear/graphics/kipi-plugins/fbexport/fbwidget.h #905091:905092
@@ -29,8 +29,8 @@
class QLabel;
class QSpinBox;
class QCheckBox;
-class QComboBox;
-class QPushButton;
+class KComboBox;
+class KPushButton;
namespace KIPI
{
@@ -66,12 +66,12 @@
QLabel* m_headerLbl;
QLabel* m_userNameDisplayLbl;
QLabel* m_permissionLbl;
- QPushButton* m_changeUserBtn;
- QPushButton* m_changePermBtn;
+ KPushButton* m_changeUserBtn;
+ KPushButton* m_changePermBtn;
- QComboBox* m_albumsCoB;
- QPushButton* m_newAlbumBtn;
- QPushButton* m_reloadAlbumsBtn;
+ KComboBox* m_albumsCoB;
+ KPushButton* m_newAlbumBtn;
+ KPushButton* m_reloadAlbumsBtn;
QCheckBox* m_resizeChB;
QSpinBox* m_dimensionSpB;
--- trunk/extragear/graphics/kipi-plugins/fbexport/fbwindow.cpp #905091:905092
@@ -27,22 +27,21 @@
// Qt includes.
#include <QFileInfo>
-#include <QPushButton>
#include <QSpinBox>
#include <QCheckBox>
-#include <QComboBox>
#include <QProgressDialog>
// KDE includes.
-#include <kdeversion.h>
-#include <kdebug.h>
-#include <kconfig.h>
-#include <klocale.h>
-#include <kmenu.h>
-#include <khelpmenu.h>
-#include <klineedit.h>
-#include <kmessagebox.h>
-#include <kpushbutton.h>
+#include <KDebug>
+#include <KConfig>
+#include <KLocale>
+#include <KMenu>
+#include <KHelpMenu>
+#include <KLineEdit>
+#include <KComboBox>
+#include <KPushButton>
+#include <KMessageBox>
+#include <KToolInvocation>
// LibKExiv2 includes.
#include <libkexiv2/kexiv2.h>
@@ -57,7 +56,6 @@
// LibKIPI includes.
#include <libkipi/interface.h>
-#include <ktoolinvocation.h>
#include "imageslist.h"
#include "kpaboutdata.h"
#include "pluginsversion.h"
@@ -86,7 +84,9 @@
m_uploadTotal = 0;
m_widget = new FbWidget(this, interface);
- setButtonGuiItem(User1, KGuiItem(i18n("Start Upload"), \
KIcon("network-workgroup"))); + setButtonGuiItem(User1, KGuiItem(i18n("Start \
Upload"), "network-workgroup", + i18n("Start \
upload to Facebook web service"))); +
setMainWidget(m_widget);
m_widget->setMinimumSize(700, 500);
@@ -262,7 +262,7 @@
FbUser user = m_talker->getUser();
m_widget->updateLabels(user.name, user.profileURL, user.uploadPerm);
m_widget->m_albumsCoB->clear();
- m_widget->m_albumsCoB->addItem(i18n("<none>"), 0);
+ m_widget->m_albumsCoB->addItem(i18n("<autocreate>"), 0);
m_sessionKey = m_talker->getSessionKey();
m_sessionExpires = m_talker->getSessionExpires();
@@ -300,7 +300,7 @@
}
m_widget->m_albumsCoB->clear();
- m_widget->m_albumsCoB->addItem(i18n("<none>"), 0);
+ m_widget->m_albumsCoB->addItem(i18n("<autocreate>"), 0);
for (int i = 0; i < albumsList.size(); ++i)
{
m_widget->m_albumsCoB->addItem(
--- trunk/extragear/graphics/kipi-plugins/fbexport/fbwindow.h #905091:905092
@@ -29,7 +29,7 @@
#include <QList>
// KDE includes.
-#include <kdialog.h>
+#include <KDialog>
// LibKIPI includes.
#include <libkipi/interface.h>
--- trunk/extragear/graphics/kipi-plugins/fbexport/mpform.cpp #905091:905092
@@ -8,7 +8,7 @@
*
* Copyright (C) 2005-2008 by Vardhman Jain <vardhman at gmail dot com>
* Copyright (C) 2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * Copyright (C) 2008 by Luka Renko <lure at kubuntu dot org>
+ * Copyright (C) 2008-2009 by Luka Renko <lure at kubuntu dot org>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -32,11 +32,11 @@
#include <QFile>
// KDE includes.
-#include <kapplication.h>
-#include <kdebug.h>
-#include <kmimetype.h>
-#include <kurl.h>
-#include <krandom.h>
+#include <KApplication>
+#include <KDebug>
+#include <KMimeType>
+#include <KUrl>
+#include <KRandom>
namespace KIPIFbExportPlugin
{
--- trunk/extragear/graphics/kipi-plugins/fbexport/mpform.h #905091:905092
@@ -8,7 +8,7 @@
*
* Copyright (C) 2005-2008 by Vardhman Jain <vardhman at gmail dot com>
* Copyright (C) 2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * Copyright (C) 2008 by Luka Renko <lure at kubuntu dot org>
+ * Copyright (C) 2008-2009 by Luka Renko <lure at kubuntu dot org>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
--- trunk/extragear/graphics/kipi-plugins/fbexport/plugin_fbexport.cpp #905091:905092
@@ -32,14 +32,14 @@
}
// KDE includes.
-#include <kdebug.h>
-#include <kconfig.h>
-#include <kapplication.h>
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kgenericfactory.h>
-#include <klibloader.h>
-#include <kstandarddirs.h>
+#include <KDebug>
+#include <KConfig>
+#include <KApplication>
+#include <KAction>
+#include <KActionCollection>
+#include <KGenericFactory>
+#include <KLibLoader>
+#include <KStandardDirs>
// LibKIPI includes.
#include <libkipi/interface.h>
--- trunk/extragear/graphics/kipi-plugins/fbexport/plugin_fbexport.h #905091:905092
@@ -8,7 +8,7 @@
*
* Copyright (C) 2005-2008 by Vardhman Jain <vardhman at gmail dot com>
* Copyright (C) 2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * Copyright (C) 2008 by Luka Renko <lure at kubuntu dot org>
+ * Copyright (C) 2008-2009 by Luka Renko <lure at kubuntu dot org>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic