Changeset 6057

Timestamp:

01/24/08 05:43:28 (7 months ago)

Author:

flynd

Message:

Use new input widget for filename fields.

Location:

branches/qt-gui_qt4/src/settings

Files:

• events.cpp (modified) (12 diffs)
• events.h (modified) (2 diffs)

branches/qt-gui_qt4/src/settings/events.cpp

@@ -27 +27 @@
 #include <QGroupBox>
 #include <QLabel>
+#include <QLineEdit>
 #include <QVBoxLayout>
-
-#ifdef USE_KDE
-#include <KDE/KUrlRequester>
-#include <QLineEdit>
-#endif
 
 #include <licq_icqd.h>
@@ -40 +36 @@
 #include "config/contactlist.h"
 #include "config/general.h"
-
 #include "core/mainwin.h"
+#include "widgets/filenameedit.h"
 
 #include "settingsdlg.h"
@@ -164 +160 @@
   laySndTopRow->addWidget(lblSndPlayer);
 
-  edtSndPlayer = new KUrlRequester();
+  edtSndPlayer = new FileNameEdit();
   edtSndPlayer->setToolTip(lblSndPlayer->toolTip());
   lblSndPlayer->setBuddy(edtSndPlayer);
@@ -176 +172 @@
   lblSndMsg->setToolTip(tr("Parameter for received messages"));
   layEventParams->addWidget(lblSndMsg, 0, 0);
-  edtSndMsg = new KUrlRequester();
+  edtSndMsg = new FileNameEdit();
   edtSndMsg->setToolTip(lblSndMsg->toolTip());
   lblSndMsg->setBuddy(edtSndMsg);
@@ -184 +180 @@
   lblSndUrl->setToolTip(tr("Parameter for received URLs"));
   layEventParams->addWidget(lblSndUrl, 1, 0);
-  edtSndUrl = new KUrlRequester();
+  edtSndUrl = new FileNameEdit();
   edtSndUrl->setToolTip(lblSndUrl->toolTip());
   lblSndUrl->setBuddy(edtSndUrl);
@@ -192 +188 @@
   lblSndChat->setToolTip(tr("Parameter for received chat requests"));
   layEventParams->addWidget(lblSndChat, 2, 0);
-  edtSndChat = new KUrlRequester();
+  edtSndChat = new FileNameEdit();
   edtSndChat->setToolTip(lblSndChat->toolTip());
   lblSndChat->setBuddy(edtSndChat);
@@ -200 +196 @@
   lblSndFile->setToolTip(tr("Parameter for received file transfers"));
   layEventParams->addWidget(lblSndFile, 3, 0);
-  edtSndFile = new KUrlRequester();
+  edtSndFile = new FileNameEdit();
   edtSndFile->setToolTip(lblSndFile->toolTip());
   lblSndFile->setBuddy(edtSndFile);
@@ -208 +204 @@
   lblSndNotify->setToolTip(tr("Parameter for online notification"));
   layEventParams->addWidget(lblSndNotify, 4, 0);
-  edtSndNotify = new KUrlRequester();
+  edtSndNotify = new FileNameEdit();
   edtSndNotify->setToolTip(lblSndNotify->toolTip());
   lblSndNotify->setBuddy(edtSndNotify);
@@ -216 +212 @@
   lblSndSysMsg->setToolTip(tr("Parameter for received system messages"));
   layEventParams->addWidget(lblSndSysMsg, 5, 0);
-  edtSndSysMsg = new KUrlRequester();
+  edtSndSysMsg = new FileNameEdit();
   edtSndSysMsg->setToolTip(lblSndSysMsg->toolTip());
   lblSndSysMsg->setBuddy(edtSndSysMsg);
@@ -224 +220 @@
   lblSndMsgSent->setToolTip(tr("Parameter for sent messages"));
   layEventParams->addWidget(lblSndMsgSent, 6, 0);
-  edtSndMsgSent = new KUrlRequester();
+  edtSndMsgSent = new FileNameEdit();
   edtSndMsgSent->setToolTip(lblSndMsgSent->toolTip());
   lblSndMsgSent->setBuddy(edtSndMsgSent);
@@ -308 +304 @@
   chkOnEvents->setChecked(oem->CommandType() != ON_EVENT_IGNORE);
   oem->Lock();
-  edtSndPlayer->setUrl(KUrl(oem->Command()));
-  edtSndMsg->setUrl(KUrl(oem->Parameter(ON_EVENT_MSG)));
-  edtSndUrl->setUrl(KUrl(oem->Parameter(ON_EVENT_URL)));
-  edtSndChat->setUrl(KUrl(oem->Parameter(ON_EVENT_CHAT)));
-  edtSndFile->setUrl(KUrl(oem->Parameter(ON_EVENT_FILE)));
-  edtSndNotify->setUrl(KUrl(oem->Parameter(ON_EVENT_NOTIFY)));
-  edtSndSysMsg->setUrl(KUrl(oem->Parameter(ON_EVENT_SYSMSG)));
-  edtSndMsgSent->setUrl(KUrl(oem->Parameter(ON_EVENT_MSGSENT)));
+  edtSndPlayer->setFileName(oem->Command());
+  edtSndMsg->setFileName(oem->Parameter(ON_EVENT_MSG));
+  edtSndUrl->setFileName(oem->Parameter(ON_EVENT_URL));
+  edtSndChat->setFileName(oem->Parameter(ON_EVENT_CHAT));
+  edtSndFile->setFileName(oem->Parameter(ON_EVENT_FILE));
+  edtSndNotify->setFileName(oem->Parameter(ON_EVENT_NOTIFY));
+  edtSndSysMsg->setFileName(oem->Parameter(ON_EVENT_SYSMSG));
+  edtSndMsgSent->setFileName(oem->Parameter(ON_EVENT_MSGSENT));
   oem->Unlock();
   //TODO make general for all plugins
@@ -362 +358 @@
   oem->SetCommandType(chkOnEvents->isChecked() ? ON_EVENT_RUN : ON_EVENT_IGNORE);
 
-  QString txtSndPlayer = edtSndPlayer->url().pathOrUrl();
-  QString txtSndMsg = edtSndMsg->url().pathOrUrl();
-  QString txtSndUrl = edtSndUrl->url().pathOrUrl();
-  QString txtSndChat = edtSndChat->url().pathOrUrl();
-  QString txtSndFile = edtSndFile->url().pathOrUrl();
-  QString txtSndNotify = edtSndNotify->url().pathOrUrl();
-  QString txtSndSysMsg = edtSndSysMsg->url().pathOrUrl();
-  QString txtSndMsgSent = edtSndMsgSent->url().pathOrUrl();
+  QString txtSndPlayer = edtSndPlayer->fileName();
+  QString txtSndMsg = edtSndMsg->fileName();
+  QString txtSndUrl = edtSndUrl->fileName();
+  QString txtSndChat = edtSndChat->fileName();
+  QString txtSndFile = edtSndFile->fileName();
+  QString txtSndNotify = edtSndNotify->fileName();
+  QString txtSndSysMsg = edtSndSysMsg->fileName();
+  QString txtSndMsgSent = edtSndMsgSent->fileName();
 
   const char* oemparams[8] = {

branches/qt-gui_qt4/src/settings/events.h

@@ -29 +29 @@
 class QGroupBox;
 class QLabel;
+class QLineEdit;
 class QVBoxLayout;
 class QWidget;
 
-#ifdef USE_KDE
-class KUrlRequester;
-class QLineEdit;
-#else
-#include <QLineEdit>
-class KUrl
-{
-public:
-  KUrl(const char* url) : myUrl(url) {}
-  KUrl(const QString& url) : myUrl(url) {}
-  QString pathOrUrl() const { return myUrl; }
-
-private:
-  QString myUrl;
-};
-
-class KUrlRequester : public QLineEdit
-{
-public:
-  KUrlRequester(QWidget* parent=0, const char* /* name */ = NULL)
-    : QLineEdit(parent) {};
-  void setUrl(const KUrl& url) { setText(url.pathOrUrl()); }
-  KUrl url() const { return KUrl(text()); }
-};
-#endif
 
 namespace LicqQtGui
 {
+class FileNameEdit;
 class SettingsDlg;
 
@@ -133 +110 @@
   QLabel* lblSndSysMsg;
   QLabel* lblSndMsgSent;
-  KUrlRequester* edtSndPlayer;
-  KUrlRequester* edtSndMsg;
-  KUrlRequester* edtSndChat;
-  KUrlRequester* edtSndUrl;
-  KUrlRequester* edtSndFile;
-  KUrlRequester* edtSndNotify;
-  KUrlRequester* edtSndSysMsg;
-  KUrlRequester* edtSndMsgSent;
+  FileNameEdit* edtSndPlayer;
+  FileNameEdit* edtSndMsg;
+  FileNameEdit* edtSndChat;
+  FileNameEdit* edtSndUrl;
+  FileNameEdit* edtSndFile;
+  FileNameEdit* edtSndNotify;
+  FileNameEdit* edtSndSysMsg;
+  FileNameEdit* edtSndMsgSent;
 };