diff --git a/krusader/Konfigurator/kgdependencies.cpp b/krusader/Konfigurator/kgdependencies.cpp --- a/krusader/Konfigurator/kgdependencies.cpp +++ b/krusader/Konfigurator/kgdependencies.cpp @@ -135,10 +135,11 @@ } } - addLabel(grid, row, 0, name, parent); + QLabel *labelPath = addLabel(grid, row, 0, name, parent); KonfiguratorURLRequester *fullPath = - createURLRequester("Dependencies", name, defaultValue, parent, false, QString(), page); + createURLRequester("Dependencies", name, defaultValue, labelPath, + parent, false, QString(), page); connect(fullPath->extension(), &KonfiguratorExtension::applyManually, this, &KgDependencies::slotApply); grid->addWidget(fullPath, row, 1); } diff --git a/krusader/Konfigurator/kggeneral.cpp b/krusader/Konfigurator/kggeneral.cpp --- a/krusader/Konfigurator/kggeneral.cpp +++ b/krusader/Konfigurator/kggeneral.cpp @@ -143,7 +143,7 @@ QLabel *label1 = new QLabel(i18n("Editor:"), editorGrp); editorGrid->addWidget(label1, 0, 0); KonfiguratorURLRequester *urlReq = createURLRequester("General", "Editor", "internal editor", - editorGrp, false, QString(), PAGE_VIEWER, false); + label1, editorGrp, false, QString(), PAGE_VIEWER, false); editorGrid->addWidget(urlReq, 0, 1); QLabel *label2 = new QLabel(i18n("Hint: use 'internal editor' if you want to use Krusader's fast built-in editor"), editorGrp); @@ -230,9 +230,10 @@ auto *hbox = new QHBoxLayout(); - hbox->addWidget(new QLabel(i18n("Temp Folder:"), generalGrp)); + QLabel *labelGrp = new QLabel(i18n("Temp Folder:"), generalGrp); + hbox->addWidget(labelGrp); KonfiguratorURLRequester *urlReq3 = createURLRequester("General", "Temp Directory", _TempDirectory, - generalGrp, false, PAGE_GENERAL); + labelGrp, generalGrp, false, PAGE_GENERAL); urlReq3->setMode(KFile::Directory); connect(urlReq3->extension(), &KonfiguratorExtension::applyManually, this, &KgGeneral::applyTempDir); hbox->addWidget(urlReq3); @@ -271,7 +272,7 @@ QLabel *label3 = new QLabel(i18n("External Terminal:"), generalGrp); terminalGrid->addWidget(label3, 0, 0); KonfiguratorURLRequester *urlReq2 = createURLRequester("General", "Terminal", _Terminal, - generalGrp, false, PAGE_GENERAL, false); + label3, generalGrp, false, PAGE_GENERAL, false); terminalGrid->addWidget(urlReq2, 0, 1); QLabel *terminalLabel = new QLabel(i18n("%d will be replaced by the workdir."), terminalGrp); diff --git a/krusader/Konfigurator/kguseractions.cpp b/krusader/Konfigurator/kguseractions.cpp --- a/krusader/Konfigurator/kguseractions.cpp +++ b/krusader/Konfigurator/kguseractions.cpp @@ -62,7 +62,7 @@ terminalGroup); terminalGrid->addWidget(labelTerminal, 0, 0); KonfiguratorURLRequester *urlReqUserActions = createURLRequester("UserActions", - "Terminal", _UserActions_Terminal, terminalGroup, false, FIRST_PAGE, false); + "Terminal", _UserActions_Terminal, labelTerminal, terminalGroup, false, FIRST_PAGE, false); terminalGrid->addWidget(urlReqUserActions, 0, 1); labelTerminal = new QLabel(i18n("%t will be replaced by the title of the action,\n%d with the workdir."), terminalGroup); diff --git a/krusader/Konfigurator/konfiguratorpage.h b/krusader/Konfigurator/konfiguratorpage.h --- a/krusader/Konfigurator/konfiguratorpage.h +++ b/krusader/Konfigurator/konfiguratorpage.h @@ -209,6 +209,7 @@ * @param configGroup The class name used in KConfig (ex. "Archives") * @param name The itemname used in KConfig (ex. "Do Tar") * @param defaultValue The default value of the URL requester + * @param label The label that is associated to the URL requester * @param parent Reference to the parent widget * @param restart The change of this parameter requires Krusader restart * @param toolTip Tooltip used for this URL requester @@ -218,8 +219,9 @@ * @return reference to the newly created URL requester */ KonfiguratorURLRequester *createURLRequester(QString configGroup, QString name, - QString defaultValue, QWidget *parent, - bool restart, const QString &toolTip = QString(), + QString defaultValue, QLabel *label, + QWidget *parent, bool restart, + const QString &toolTip = QString(), int page = FIRST_PAGE, bool expansion = true); /** diff --git a/krusader/Konfigurator/konfiguratorpage.cpp b/krusader/Konfigurator/konfiguratorpage.cpp --- a/krusader/Konfigurator/konfiguratorpage.cpp +++ b/krusader/Konfigurator/konfiguratorpage.cpp @@ -137,11 +137,14 @@ } KonfiguratorURLRequester* KonfiguratorPage::createURLRequester(QString configGroup, QString name, - QString defaultValue, QWidget *parent, bool restart, const QString &toolTip, int page, bool expansion) + QString defaultValue, QLabel *label, QWidget *parent, bool restart, + const QString &toolTip, int page, bool expansion) { KonfiguratorURLRequester *urlRequester = new KonfiguratorURLRequester(std::move(configGroup), std::move(name), std::move(defaultValue), parent, restart, page, expansion); if (!toolTip.isEmpty()) { + label->setWhatsThis(toolTip); + label->setToolTip(toolTip); urlRequester->setWhatsThis(toolTip); urlRequester->setToolTip(toolTip); }