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

List:       kde-commits
Subject:    [kdesvn/frameworks] src/svnfrontend: Port RevisionTree from KDialog to KSvnSimpleOkDialog
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2016-03-31 19:21:07
Message-ID: E1ali9T-0005rB-6v () scm ! kde ! org
[Download RAW message or body]

Git commit 3dc6bafc362ba3cf59ba5043dae1997023cb9e11 by Christian Ehrlicher.
Committed on 27/03/2016 at 16:20.
Pushed by chehrlic into branch 'frameworks'.

Port RevisionTree from KDialog to KSvnSimpleOkDialog

M  +2    -3    src/svnfrontend/graphtree/revisiontree.cpp
M  +2    -2    src/svnfrontend/graphtree/revisiontree.h
M  +8    -16   src/svnfrontend/svnactions.cpp

http://commits.kde.org/kdesvn/3dc6bafc362ba3cf59ba5043dae1997023cb9e11

diff --git a/src/svnfrontend/graphtree/revisiontree.cpp \
b/src/svnfrontend/graphtree/revisiontree.cpp index 9476217..53ffe53 100644
--- a/src/svnfrontend/graphtree/revisiontree.cpp
+++ b/src/svnfrontend/graphtree/revisiontree.cpp
@@ -116,8 +116,7 @@ RevisionTree::RevisionTree(const svn::ClientP &aClient,
                            const QString &reposRoot,
                            const svn::Revision &startr, const svn::Revision &endr,
                            const QString &origin,
-                           const svn::Revision &baserevision,
-                           QWidget *treeParent, QWidget *parent)
+                           const svn::Revision &baserevision, QWidget *parent)
     : m_InitialRevsion(0), m_Path(origin), m_Valid(false)
 {
     m_Data = new RtreeData;
@@ -176,7 +175,7 @@ RevisionTree::RevisionTree(const svn::ClientP &aClient,
             m_Data->progress->progressBar()->setRange(0, 100);
             m_Data->progress->progressBar()->setTextVisible(false);
             m_Data->m_stopTick.restart();
-            m_Data->m_TreeDisplay = new RevTreeWidget(m_Data->m_Client, treeParent);
+            m_Data->m_TreeDisplay = new RevTreeWidget(m_Data->m_Client);
             if (bottomUpScan(m_InitialRevsion, 0, m_Path, 0)) {
                 m_Valid = true;
                 m_Data->m_TreeDisplay->setBasePath(reposRoot);
diff --git a/src/svnfrontend/graphtree/revisiontree.h \
b/src/svnfrontend/graphtree/revisiontree.h index c33e269..897ea5f 100644
--- a/src/svnfrontend/graphtree/revisiontree.h
+++ b/src/svnfrontend/graphtree/revisiontree.h
@@ -46,8 +46,8 @@ public:
                  QObject *aListener,
                  const QString &reposRoot,
                  const svn::Revision &startr, const svn::Revision &endr,
-                 const QString &, const svn::Revision &baserevision, QWidget \
                *treeParent,
-                 QWidget *parent = 0);
+                 const QString &, const svn::Revision &baserevision,
+                 QWidget *parent = nullptr);
     virtual ~RevisionTree();
 
     bool isValid()const;
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 90878d7..09ecb2f 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -64,15 +64,12 @@
 #include "fronthelpers/cursorstack.h"
 #include "cacheentry.h"
 
-#include <kdialog.h>
-#include <ktextbrowser.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
 #include <kconfig.h>
 #include <kmimetypetrader.h>
 #include <krun.h>
-#include <kvbox.h>
 
 #include <QApplication>
 #include <QDesktopServices>
@@ -491,18 +488,15 @@ void SvnActions::makeTree(const QString &what, const \
svn::Revision &_rev, const  stopFillCache();
     }
 
-    QPointer<KDialog> dlg(new KDialog(m_Data->m_ParentList->realWidget()));
-    dlg->setWindowTitle(i18n("History of %1", \
                info.url().toString().mid(reposRoot.length())));
-    dlg->setButtons(KDialog::Ok);
+    QPointer<KSvnSimpleOkDialog> dlg(new \
KSvnSimpleOkDialog(QLatin1String("revisiontree_dlg"), \
m_Data->m_ParentList->realWidget())); +    dlg->setWindowTitle(i18n("1History of %1", \
info.url().toString().mid(reposRoot.length())));  
-    QWidget *Dialog1Layout = new KVBox(dlg);
-    dlg->setMainWidget(Dialog1Layout);
-
-    RevisionTree rt(m_Data->m_Svnclient, m_Data->m_SvnContextListener, reposRoot,
-                    startr, endr,
-                    info.url().toString().mid(reposRoot.length()), _rev, \
                Dialog1Layout, m_Data->m_ParentList->realWidget());
-    if (rt.isValid()) {
-        QWidget *disp = rt.getView();
+    RevisionTree *rt(new RevisionTree(m_Data->m_Svnclient, \
m_Data->m_SvnContextListener, reposRoot, +                                      \
startr, endr, +                                      \
info.url().toString().mid(reposRoot.length()), _rev, dlg)); +    \
dlg->addWidget(rt->getView()); +    if (rt->isValid()) {
+        QWidget *disp = rt->getView();
         if (disp) {
             connect(
                 disp, \
SIGNAL(makeNorecDiff(QString,svn::Revision,QString,svn::Revision,QWidget*)), @@ \
-514,9 +508,7 @@ void SvnActions::makeTree(const QString &what, const svn::Revision \
&_rev, const  );
             connect(disp, \
                SIGNAL(makeCat(svn::Revision,QString,QString,svn::Revision,QWidget*)),
                
                     this, \
                SLOT(slotMakeCat(svn::Revision,QString,QString,svn::Revision,QWidget*)));
                
-            WindowGeometryHelper wgh(dlg, QLatin1String("revisiontree_dlg"));
             dlg->exec();
-            wgh.save();
         }
     }
     delete dlg;


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