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

List:       kde-commits
Subject:    kdebase/kmenuedit
From:       Waldo Bastian <bastian () kde ! org>
Date:       2004-08-02 15:02:20
Message-ID: 20040802150220.9B9BF94A3 () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

Quote paths when using Browse button. (BR86186)
CCMAIL: 86186-done@bugs.kde.org


  M +24 -10    basictab.cpp   1.41
  M +1 -0      basictab.h   1.21


--- kdebase/kmenuedit/basictab.cpp  #1.40:1.41
@@ -39,4 +39,5 @@
 #include <kcombobox.h>
 #include <kkeydialog.h>
+#include <kprocess.h>
 #include "khotkeys.h"
 
@@ -95,4 +96,6 @@ BasicTab::BasicTab( QWidget *parent, con
     connect(_execEdit, SIGNAL(textChanged(const QString&)),
             SLOT(slotChanged()));
+    connect(_execEdit, SIGNAL(urlSelected(const QString&)),
+            SLOT(slotExecSelected()));
     connect(_launchCB, SIGNAL(clicked()), SLOT(launchcb_clicked()));
     connect(_systrayCB, SIGNAL(clicked()), SLOT(systraycb_clicked()));
@@ -101,8 +104,8 @@ BasicTab::BasicTab( QWidget *parent, con
     grid->addMultiCellWidget(_nameEdit, 0, 0, 1, 1);
     grid->addMultiCellWidget(_descriptionEdit, 1, 1, 1, 1);
-    grid->addMultiCellWidget(_commentEdit, 2, 2, 1, 1);
-    grid->addMultiCellWidget(_execEdit, 3, 3, 1, 1);
-    grid->addMultiCellWidget(_launchCB, 4, 4, 0, 1);
-    grid->addMultiCellWidget(_systrayCB, 5, 5, 0, 1);
+    grid->addMultiCellWidget(_commentEdit, 2, 2, 1, 2);
+    grid->addMultiCellWidget(_execEdit, 3, 3, 1, 2);
+    grid->addMultiCellWidget(_launchCB, 4, 4, 0, 2);
+    grid->addMultiCellWidget(_systrayCB, 5, 5, 0, 2);
 
     // setup icon button
@@ -270,5 +273,7 @@ void BasicTab::setFolderInfo(MenuFolderI
     _nameEdit->setText(folderInfo->caption);
     _descriptionEdit->setText(folderInfo->genericname);
+    _descriptionEdit->setCursorPosition(0);
     _commentEdit->setText(folderInfo->comment);
+    _commentEdit->setCursorPosition(0);
     _iconButton->setIcon(folderInfo->icon);
 
@@ -322,5 +327,7 @@ void BasicTab::setEntryInfo(MenuEntryInf
     _nameEdit->setText(df->readName());
     _descriptionEdit->setText(df->readGenericName());
+    _descriptionEdit->setCursorPosition(0);
     _commentEdit->setText(df->readComment());
+    _commentEdit->setCursorPosition(0);
     _iconButton->setIcon(df->readIcon());
 
@@ -435,4 +442,11 @@ void BasicTab::uidcb_clicked()
 }
 
+void BasicTab::slotExecSelected()
+{
+    QString path = _execEdit->lineEdit()->text();
+    if (!path.startsWith("'"))
+        _execEdit->lineEdit()->setText(KProcess::quote(path));
+}
+
 void BasicTab::slotCapturedShortcut(const KShortcut& cut)
 {

--- kdebase/kmenuedit/basictab.h  #1.20:1.21
@@ -63,4 +63,5 @@ protected slots:
     void uidcb_clicked();
     void slotCapturedShortcut(const KShortcut&);
+    void slotExecSelected();
 
 protected:


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