[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: Re: [kdelibs/KDE/4.12] kio/bookmarks: When a user creates a new bookmark folder make that the curren
From: Dawit A <adawit () kde ! org>
Date: 2013-12-25 16:10:24
Message-ID: CALa28R6-pXAtCeQt5gtL6cHdq-_YvQRh+-V80W-TNK3ki=W3YQ () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Well I can and did do the forward port, but at the moment I cannot check
whether that compile fine or not. If someone can check that, I can push
these changes. Otherwise, they will have to wait until I have properly
setup frameworks environment.
On Tue, Dec 24, 2013 at 10:36 AM, David Faure <faure@kde.org> wrote:
> On Tuesday 24 December 2013 14:49:59 Dawit Alemayehu wrote:
> > Git commit 2d83344174fe956dd6df0be6c96e068e5186371c by Dawit Alemayehu.
> > Committed on 15/12/2013 at 16:25.
> > Pushed by adawit into branch 'KDE/4.12'.
> >
> > When a user creates a new bookmark folder make that the current item.
> >
> > BUG: 152158
> > REVIEW: 114479
> > FIXED-IN: 4.12.1
>
> Don't forget to forwardport to the "kbookmarks" framework by hand.
>
> Same for your kio commit -> "kio" framework.
>
> There's no automatic merge anymore, as announced on k-c-d.
>
> --
> David Faure, faure@kde.org, http://www.davidfaure.fr
> Working on KDE, in particular KDE Frameworks 5
>
>
[Attachment #5 (text/html)]
<div dir="ltr">Well I can and did do the forward port, but at the moment I cannot \
check whether that compile fine or not. If someone can check that, I can push these \
changes. Otherwise, they will have to wait until I have properly setup frameworks \
environment.</div>
<div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Dec 24, 2013 at \
10:36 AM, David Faure <span dir="ltr"><<a href="mailto:faure@kde.org" \
target="_blank">faure@kde.org</a>></span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex">
<div class="im">On Tuesday 24 December 2013 14:49:59 Dawit Alemayehu wrote:<br>
> Git commit 2d83344174fe956dd6df0be6c96e068e5186371c by Dawit Alemayehu.<br>
> Committed on 15/12/2013 at 16:25.<br>
> Pushed by adawit into branch 'KDE/4.12'.<br>
><br>
> When a user creates a new bookmark folder make that the current item.<br>
><br>
> BUG: 152158<br>
> REVIEW: 114479<br>
> FIXED-IN: 4.12.1<br>
<br>
</div>Don't forget to forwardport to the "kbookmarks" framework by \
hand.<br> <br>
Same for your kio commit -> "kio" framework.<br>
<br>
There's no automatic merge anymore, as announced on k-c-d.<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
David Faure, <a href="mailto:faure@kde.org">faure@kde.org</a>, <a \
href="http://www.davidfaure.fr" target="_blank">http://www.davidfaure.fr</a><br> \
Working on KDE, in particular KDE Frameworks 5<br> <br>
</font></span></blockquote></div><br></div>
--047d7b33d5a09ee63904ee5e1bf0--
["frameworks_bug_152158.patch" (application/octet-stream)]
commit 684cbacd882dfbebd720290549ab87343100695b
Author: Dawit Alemayehu <adawit@kde.org>
Date: Wed Dec 25 10:18:41 2013 -0500
When a user creates a new bookmark folder make that the current item.
BUG: 152158
REVIEW: 114479
FIXED-IN: 4.12.1
diff --git a/src/kbookmarkdialog.cpp b/src/kbookmarkdialog.cpp
index da158af..019531d 100644
--- a/src/kbookmarkdialog.cpp
+++ b/src/kbookmarkdialog.cpp
@@ -98,12 +98,16 @@ void KBookmarkDialogPrivate::initLayoutPrivate()
layout = true;
}
-void KBookmarkDialogPrivate::fillGroup(QTreeWidgetItem *parentItem, const \
KBookmarkGroup &group) +void KBookmarkDialogPrivate::fillGroup(QTreeWidgetItem \
*parentItem, const KBookmarkGroup &group, const KBookmarkGroup &selectGroup) {
for (KBookmark bk = group.first(); !bk.isNull(); bk = group.next(bk)) {
if (bk.isGroup()) {
- QTreeWidgetItem *item = new KBookmarkTreeItem(parentItem, folderTree, \
bk.toGroup());
- fillGroup(item, bk.toGroup());
+ const KBookmarkGroup bkGroup = bk.toGroup();
+ QTreeWidgetItem* item = new KBookmarkTreeItem(parentItem, m_folderTree, \
bkGroup); + if (selectGroup == bkGroup) {
+ m_folderTree->setCurrentItem(item);
+ }
+ fillGroup(item, bkGroup, selectGroup);
}
}
}
@@ -369,7 +373,7 @@ void KBookmarkDialog::newFolderButton()
d->mgr->emitChanged(parentGroup);
d->folderTree->clear();
QTreeWidgetItem *root = new KBookmarkTreeItem(d->folderTree);
- d->fillGroup(root, d->mgr->root());
+ d->fillGroup(root, d->mgr->root(), group);
}
}
diff --git a/src/kbookmarkdialog_p.h b/src/kbookmarkdialog_p.h
index 81beb85..ac63954 100644
--- a/src/kbookmarkdialog_p.h
+++ b/src/kbookmarkdialog_p.h
@@ -43,7 +43,7 @@ public:
// selects the specified bookmark in the folder tree
void setParentBookmark(const KBookmark &bm);
KBookmarkGroup parentBookmark();
- void fillGroup(QTreeWidgetItem *parentItem, const KBookmarkGroup &group);
+ void fillGroup(QTreeWidgetItem *parentItem, const KBookmarkGroup &group, const \
KBookmarkGroup &selectGroup = KBookmarkGroup());
KBookmarkDialog *q;
BookmarkDialogMode mode;
["frameworks_bug_153421.patch" (application/octet-stream)]
commit e35d0c41e77885362c93d8d0b1695116fc203fd3
Author: Dawit Alemayehu <adawit@kde.org>
Date: Wed Dec 25 09:35:21 2013 -0500
Changed OpenWith dialog from Qt::ApplicationModal to Qt::WindowModal.
BUG: 153421
REVIEW: 114473
FIXED-IN: 4.12.1
diff --git a/src/widgets/krun.cpp b/src/widgets/krun.cpp
index 92dcfd8..9bdc6bd 100644
--- a/src/widgets/krun.cpp
+++ b/src/widgets/krun.cpp
@@ -245,6 +245,7 @@ bool KRun::displayOpenWithDialog(const QList<QUrl> &lst, QWidget *window, bool t
}
#endif
KOpenWithDialog l(lst, i18n("Open with:"), QString(), window);
+ l.setWindowModality(Qt::WindowModal);
if (l.exec()) {
KService::Ptr service = l.service();
if (!service) {
["frameworks_review_114436.patch" (application/octet-stream)]
commit d4b51ba59cec908b305e51fc804e6b78aea25988
Author: Dawit Alemayehu <adawit@kde.org>
Date: Wed Dec 25 10:10:41 2013 -0500
Changed dialogs from Qt::ApplicationModal (default) to Qt::WindowModal.
REVIEW: 114436
diff --git a/src/widgets/jobuidelegate.cpp b/src/widgets/jobuidelegate.cpp
index ee659f7..1654d96 100644
--- a/src/widgets/jobuidelegate.cpp
+++ b/src/widgets/jobuidelegate.cpp
@@ -152,6 +152,7 @@ KIO::RenameDialog_Result KIO::JobUiDelegate::askFileRename(KJob *job,
sizeSrc, sizeDest,
ctimeSrc, ctimeDest, mtimeSrc,
mtimeDest);
+ dlg.setWindowModality(Qt::WindowModal);
connect(job, SIGNAL(finished(KJob*)), &dlg, SLOT(reject())); // #192976
KIO::RenameDialog_Result res = static_cast<RenameDialog_Result>(dlg.exec());
if (res == R_AUTO_RENAME) {
@@ -168,6 +169,7 @@ KIO::SkipDialog_Result KIO::JobUiDelegate::askSkip(KJob *job,
{
// We now do it in process. So this method is a useless wrapper around KIO::open_RenameDialog.
KIO::SkipDialog dlg(KJobWidgets::window(job), multi, error_text);
+ dlg.setWindowModality(Qt::WindowModal);
connect(job, SIGNAL(finished(KJob*)), &dlg, SLOT(reject())); // #192976
return static_cast<KIO::SkipDialog_Result>(dlg.exec());
}
@@ -212,8 +214,9 @@ bool KIO::JobUiDelegate::askDeleteConfirmation(const QList<QUrl> &urls,
}
}
- QWidget *widget = job() ? window() : NULL; // ### job is NULL here, most of the time, right?
int result;
+ QWidget *widget = job() ? window() : NULL; // ### job is NULL here, most of the time, right?
+ const KMessageBox::Options options = KMessageBox::Notify | KMessageBox::WindowModal;
switch (deletionType) {
case Delete:
result = KMessageBox::warningContinueCancelList(
@@ -223,7 +226,7 @@ bool KIO::JobUiDelegate::askDeleteConfirmation(const QList<QUrl> &urls,
i18n("Delete Files"),
KStandardGuiItem::del(),
KStandardGuiItem::cancel(),
- keyName, KMessageBox::Notify);
+ keyName, options);
break;
case EmptyTrash:
result = KMessageBox::warningContinueCancel(
@@ -233,7 +236,7 @@ bool KIO::JobUiDelegate::askDeleteConfirmation(const QList<QUrl> &urls,
KGuiItem(i18nc("@action:button", "Empty Trash"),
QIcon::fromTheme("user-trash")),
KStandardGuiItem::cancel(),
- keyName, KMessageBox::Notify);
+ keyName, options);
break;
case Trash:
default:
@@ -244,7 +247,7 @@ bool KIO::JobUiDelegate::askDeleteConfirmation(const QList<QUrl> &urls,
i18n("Move to Trash"),
KGuiItem(i18nc("Verb", "&Trash"), "user-trash"),
KStandardGuiItem::cancel(),
- keyName, KMessageBox::Notify);
+ keyName, options);
}
if (!keyName.isEmpty()) {
// Check kmessagebox setting... erase & copy to konquerorrc.
@@ -279,30 +282,32 @@ int KIO::JobUiDelegate::requestMessageBox(KIO::JobUiDelegate::MessageBoxType typ
const KGuiItem buttonYesGui(buttonYes, iconYes);
const KGuiItem buttonNoGui(buttonNo, iconNo);
+ KMessageBox::Options options = (KMessageBox::Notify | KMessageBox::WindowModal);
switch (type) {
case QuestionYesNo:
result = KMessageBox::questionYesNo(
window(), text, caption, buttonYesGui,
- buttonNoGui, dontAskAgainName);
+ buttonNoGui, dontAskAgainName, options);
break;
case WarningYesNo:
result = KMessageBox::warningYesNo(
window(), text, caption, buttonYesGui,
- buttonNoGui, dontAskAgainName);
+ buttonNoGui, dontAskAgainName,
+ options | KMessageBox::Dangerous);
break;
case WarningYesNoCancel:
result = KMessageBox::warningYesNoCancel(
window(), text, caption, buttonYesGui, buttonNoGui,
- KStandardGuiItem::cancel(), dontAskAgainName);
+ KStandardGuiItem::cancel(), dontAskAgainName, options);
break;
case WarningContinueCancel:
result = KMessageBox::warningContinueCancel(
window(), text, caption, buttonYesGui,
- KStandardGuiItem::cancel(), dontAskAgainName);
+ KStandardGuiItem::cancel(), dontAskAgainName, options);
break;
case Information:
- KMessageBox::information(window(), text, caption, dontAskAgainName);
+ KMessageBox::information(window(), text, caption, dontAskAgainName, options);
result = 1; // whatever
break;
case SSLMessageBox: {
@@ -334,7 +339,7 @@ int KIO::JobUiDelegate::requestMessageBox(KIO::JobUiDelegate::MessageBoxType typ
result = -1;
KMessageBox::information(window(),
i18n("The peer SSL certificate chain appears to be corrupt."),
- i18n("SSL"));
+ i18n("SSL"), QString(), options);
}
// KSslInfoDialog deletes itself (Qt::WA_DeleteOnClose).
delete kid;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic