[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/krfb/krfb
From:       George Kiagiadakis <kiagiadakis.george () gmail ! com>
Date:       2010-11-11 10:21:48
Message-ID: 20101111102148.E2805AC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195493 by gkiagia:

Make the main dialog a KXmlGuiWindow.
BUG: 180942
BUG: 171059

 M  +25 -30    manageinvitationsdialog.cpp  
 M  +3 -3      manageinvitationsdialog.h  
 M  +2 -2      trayicon.cpp  
 M  +1 -1      trayicon.h  


--- trunk/KDE/kdenetwork/krfb/krfb/manageinvitationsdialog.cpp #1195492:1195493
@@ -23,6 +23,8 @@
 #include <KStandardGuiItem>
 #include <KSystemTimeZone>
 #include <KToolInvocation>
+#include <KStandardAction>
+#include <KActionCollection>
 
 #include <QtGui/QWidget>
 #include <QtGui/QToolTip>
@@ -48,35 +50,28 @@
 
 
 ManageInvitationsDialog::ManageInvitationsDialog(QWidget *parent)
-    : KDialog(parent)
+    : KXmlGuiWindow(parent)
 {
-    setCaption(i18n("Invitation"));
-    setButtons(User1 | Close | Help);
-    setHelp(QString(), "krfb");
-    setDefaultButton(NoDefault);
+    setAttribute(Qt::WA_DeleteOnClose, false);
 
-    setMinimumSize(500, 330);
+    QWidget *mainWidget = new QWidget;
+    m_ui.setupUi(mainWidget);
+    m_ui.pixmapLabel->setPixmap(KIcon("krfb").pixmap(128));
+    setCentralWidget(mainWidget);
 
-    setupUi(mainWidget());
-    pixmapLabel->setPixmap(KIcon("krfb").pixmap(128));
+    connect(m_ui.helpLabel, SIGNAL(linkActivated(QString)), SLOT(showWhatsthis()));
+    connect(m_ui.newPersonalInvitationButton, SIGNAL(clicked()), SLOT(inviteManually()));
+    connect(m_ui.newEmailInvitationButton, SIGNAL(clicked()), SLOT(inviteByMail()));
+    connect(InvitationManager::self(), SIGNAL(invitationNumChanged(int)), SLOT(reloadInvitations()));
+    connect(m_ui.deleteAllButton, SIGNAL(clicked()), SLOT(deleteAll()));
+    connect(m_ui.deleteOneButton, SIGNAL(clicked()), SLOT(deleteCurrent()));
+    connect(m_ui.invitationWidget, SIGNAL(itemSelectionChanged()), SLOT(selectionChanged()));
 
-    setButtonGuiItem(User1, KStandardGuiItem::configure());
+    KStandardAction::quit(QCoreApplication::instance(), SLOT(quit()), actionCollection());
+    KStandardAction::preferences(this, SLOT(showConfiguration()), actionCollection());
 
-    connect(helpLabel, SIGNAL(linkActivated(QString)),
-            SLOT(showWhatsthis()));
-    connect(newPersonalInvitationButton, SIGNAL(clicked()),
-            SLOT(inviteManually()));
-    connect(newEmailInvitationButton, SIGNAL(clicked()),
-            SLOT(inviteByMail()));
-    connect(InvitationManager::self(), SIGNAL(invitationNumChanged(int)),
-            SLOT(reloadInvitations()));
-    connect(this, SIGNAL(user1Clicked()), SLOT(showConfiguration()));
-    connect(deleteAllButton, SIGNAL(clicked()),
-            SLOT(deleteAll()));
-    connect(deleteOneButton, SIGNAL(clicked()),
-            SLOT(deleteCurrent()));
-    connect(invitationWidget, SIGNAL(itemSelectionChanged()),
-            SLOT(selectionChanged()));
+    setupGUI(QSize(550, 330));
+    setAutoSaveSettings();
 
     reloadInvitations();
 }
@@ -162,17 +157,17 @@
 
 void ManageInvitationsDialog::reloadInvitations()
 {
-    invitationWidget->clear();
+    m_ui.invitationWidget->clear();
     KLocale *loc = KGlobal::locale();
     foreach(const Invitation & inv, InvitationManager::self()->invitations()) {
         QStringList strs;
         strs <<  loc->formatDateTime(inv.creationTime()) << loc->formatDateTime(inv.expirationTime());
         QTreeWidgetItem *it = new QTreeWidgetItem(strs);
-        invitationWidget->addTopLevelItem(it);
+        m_ui.invitationWidget->addTopLevelItem(it);
         it->setData(0, Qt::UserRole + 1, inv.creationTime());
     }
-    invitationWidget->resizeColumnToContents(0);
-    deleteAllButton->setEnabled(InvitationManager::self()->activeInvitations() > 0);
+    m_ui.invitationWidget->resizeColumnToContents(0);
+    m_ui.deleteAllButton->setEnabled(InvitationManager::self()->activeInvitations() > 0);
 }
 
 void ManageInvitationsDialog::showConfiguration()
@@ -219,7 +214,7 @@
     disconnect(InvitationManager::self(), SIGNAL(invitationNumChanged(int)),
                this, SLOT(reloadInvitations()));
 
-    QList<QTreeWidgetItem *> itl = invitationWidget->selectedItems();
+    QList<QTreeWidgetItem *> itl = m_ui.invitationWidget->selectedItems();
     foreach(QTreeWidgetItem * itm, itl) {
         foreach(const Invitation & inv, InvitationManager::self()->invitations()) {
             if (inv.creationTime() == itm->data(0, Qt::UserRole + 1)) {
@@ -237,7 +232,7 @@
 
 void ManageInvitationsDialog::selectionChanged()
 {
-    deleteOneButton->setEnabled(invitationWidget->selectedItems().size() > 0);
+    m_ui.deleteOneButton->setEnabled(m_ui.invitationWidget->selectedItems().size() > 0);
 }
 
 
--- trunk/KDE/kdenetwork/krfb/krfb/manageinvitationsdialog.h #1195492:1195493
@@ -12,12 +12,12 @@
 
 #include "ui_manageinvitations.h"
 
-#include <KDialog>
+#include <KXmlGuiWindow>
 
 /**
     @author Alessandro Praduroux <pradu@pradu.it>
 */
-class ManageInvitationsDialog : public KDialog, private Ui::ManageInvitationsDialog
+class ManageInvitationsDialog : public KXmlGuiWindow
 {
     Q_OBJECT
 public:
@@ -36,7 +36,7 @@
     void selectionChanged();
 
 private:
-
+    Ui::ManageInvitationsDialog m_ui;
 };
 
 #endif
--- trunk/KDE/kdenetwork/krfb/krfb/trayicon.cpp #1195492:1195493
@@ -94,8 +94,8 @@
 
 //**********
 
-TrayIcon::TrayIcon(KDialog *d)
-    : KStatusNotifierItem(d)
+TrayIcon::TrayIcon(QWidget *mainWindow)
+    : KStatusNotifierItem(mainWindow)
 {
     setIconByPixmap(KIcon("krfb").pixmap(22, 22, KIcon::Disabled));
 
--- trunk/KDE/kdenetwork/krfb/krfb/trayicon.h #1195492:1195493
@@ -34,7 +34,7 @@
 {
     Q_OBJECT
 public:
-    TrayIcon(KDialog *);
+    TrayIcon(QWidget *mainWindow);
 
 public Q_SLOTS:
     void onClientConnected(RfbClient *client);
[prev in list] [next in list] [prev in thread] [next in thread]