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

List:       kde-commits
Subject:    kdebase/kicker/ui
From:       Stephan Binner <binner () kde ! org>
Date:       2004-11-09 12:45:47
Message-ID: 20041109124547.C683616CE7 () office ! kde ! org
[Download RAW message or body]

CVS commit by binner: 

Finer/more correct Kiosk restrictions, added "Put Into Run Dialog"


  M +35 -22    service_mnu.cpp   1.83
  M +6 -5      service_mnu.h   1.34


--- kdebase/kicker/ui/service_mnu.cpp  #1.82:1.83
@@ -507,5 +507,5 @@ void PanelServiceMenu::mousePressEvent(Q
 void PanelServiceMenu::mouseReleaseEvent(QMouseEvent * ev)
 {
-    if (ev->button()==RightButton && kapp->authorizeKAction("menuedit")) {
+    if (ev->button()==RightButton) {
         int id = idAt( ev->pos() );
 
@@ -526,12 +526,20 @@ void PanelServiceMenu::mouseReleaseEvent
         switch (contextKSycocaEntry_->sycocaType()) {
             case KST_KService:
+                if (kapp->authorize("editable_desktop_icons"))
                 popupMenu_->insertItem( SmallIconSet("desktop"), i18n("Add Item to \
Desktop"), AddItemToDesktop ); +                if \
                (kapp->authorizeKAction("kicker_rmb"))
                 popupMenu_->insertItem( SmallIconSet("kicker"), i18n("Add Item to \
Main Panel"), AddItemToPanel ); +                if \
                (kapp->authorizeKAction("menuedit"))
                 popupMenu_->insertItem( SmallIconSet("kmenuedit"), i18n("Edit \
Item"), EditItem ); +                if (kapp->authorize("run_command"))
+                    popupMenu_->insertItem( SmallIconSet("run"), i18n("Put Into Run \
Dialog"), PutIntoRunDialog );  break;
 
             case KST_KServiceGroup:
+                if (kapp->authorize("editable_desktop_icons"))
                 popupMenu_->insertItem( SmallIconSet("desktop"), i18n("Add Menu to \
Desktop"), AddMenuToDesktop ); +                if \
                (kapp->authorizeKAction("kicker_rmb"))
                 popupMenu_->insertItem( SmallIconSet("kicker"), i18n("Add Menu to \
Main Panel"), AddMenuToPanel ); +                if \
                (kapp->authorizeKAction("menuedit"))
                 popupMenu_->insertItem( SmallIconSet("kmenuedit"), i18n("Edit \
Menu"), EditMenu );  break;
@@ -586,4 +594,9 @@ void PanelServiceMenu::slotContextMenu(i
             break;
 
+        case PutIntoRunDialog:
+            service = static_cast<KService *>(contextKSycocaEntry_);
+            kapp->dcopClient()->send("kdesktop", "default", \
"popupExecuteCommand(QString)", service->exec()); +            break;
+
         case AddMenuToDesktop:
             g = static_cast<KServiceGroup *>(contextKSycocaEntry_);

--- kdebase/kicker/ui/service_mnu.h  #1.33:1.34
@@ -111,5 +111,6 @@ private slots:
     
 private:
-    enum ContextMenuEntry { AddItemToPanel, EditItem, AddMenuToPanel, EditMenu, \
AddItemToDesktop, AddMenuToDesktop }; +    enum ContextMenuEntry { AddItemToPanel, \
EditItem, AddMenuToPanel, EditMenu, +                            AddItemToDesktop, \
AddMenuToDesktop, PutIntoRunDialog };  KPopupMenu* popupMenu_;
     KSycocaEntry* contextKSycocaEntry_;


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