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

List:       kde-commits
Subject:    [kexi/3.0] src: Use KStandardGuiItem in few more cases
From:       Pino Toscano <pino () kde ! org>
Date:       2016-12-05 7:04:51
Message-ID: E1cDnKV-0000Tb-9T () code ! kde ! org
[Download RAW message or body]

Git commit c4a107bef8221d8dfb1ba1a3beb30954ba11eba5 by Pino Toscano.
Committed on 05/12/2016 at 07:04.
Pushed by pino into branch '3.0'.

Use KStandardGuiItem in few more cases

... instead of creating KGuiItem's from scratch

M  +2    -2    src/main/KexiMainWindow.cpp
M  +1    -1    src/widget/KexiFileWidget.cpp

https://commits.kde.org/kexi/c4a107bef8221d8dfb1ba1a3beb30954ba11eba5

diff --git a/src/main/KexiMainWindow.cpp b/src/main/KexiMainWindow.cpp
index f2d193926..f2c2f2c83 100644
--- a/src/main/KexiMainWindow.cpp
+++ b/src/main/KexiMainWindow.cpp
@@ -3439,7 +3439,7 @@ tristate KexiMainWindow::removeObject(KexiPart::Item *item, \
bool dontAsk)  part->info()->name(), item->name()),
                 xi18nc("@title:window Delete Object %1.",
                       "Delete <resource>%1</resource>?", item->name()),
-                KGuiItem(xi18nc("@action:button Delete object", "Delete"), \
koIconName("edit-delete")), +                KStandardGuiItem::del(),
                 KStandardGuiItem::no(), QString(), KMessageBox::Notify | \
KMessageBox::Dangerous))  {
             return cancelled;
@@ -3518,7 +3518,7 @@ void KexiMainWindow::renameObject(KexiPart::Item *item, const \
QString& _newName,  "<para>Do you want to close it?</para>",
                             item->name());
         int r = KMessageBox::questionYesNo(this, msg, QString(),
-                                           KGuiItem(xi18nc("@action:button", "Close \
Window"), koIconName("window-close")), +                                           \
KStandardGuiItem::closeWindow(),  KStandardGuiItem::cancel());
         if (r != KMessageBox::Yes) {
             *success = false;
diff --git a/src/widget/KexiFileWidget.cpp b/src/widget/KexiFileWidget.cpp
index d4412d0a6..52812a7ac 100644
--- a/src/widget/KexiFileWidget.cpp
+++ b/src/widget/KexiFileWidget.cpp
@@ -386,7 +386,7 @@ bool KexiFileWidget::askForOverwriting(const QString& filePath, \
QWidget *parent)  "<para>Do you want to overwrite it?</para>",
                            QDir::toNativeSeparators(filePath)),
                     QString(),
-                    KGuiItem(xi18nc("@action:button Overwrite File", "Overwrite")), \
KStandardGuiItem::no()); +                    KStandardGuiItem::overwrite(), \
KStandardGuiItem::no());  if (res == KMessageBox::Yes)
         return true;
     return false;


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