issue-81 added option to hide path in tooltips

Author: lbellonda

src/config.cpp

@@ -52,6 +52,7 @@ const QString Config::KEY_ELEMENT_ELEMENTFONTSIZE("element/elementFontSize");
 const QString Config::KEY_ELEMENT_ELEMENTFONTITALIC("element/elementFontItalic");
 const QString Config::KEY_ELEMENT_ELEMENTFONTBOLD("element/elementFontBold");
 const QString Config::KEY_ELEMENT_TEXT_TOOLTIP_IMAGE("element/showImagesOnTextTooltip");
+const QString Config::KEY_ELEMENT_TEXT_TOOLTIP_PATH("element/showPathOnTextTooltip");
 
 // mainview
 const QString Config::KEY_MAIN_COMPACTVIEW("main/compactView");

src/config/configurationgeneraloptions.cpp

@@ -88,6 +88,7 @@ void ConfigurationGeneralOptions::init(ApplicationData* data)
     ui->cbShowTagComplex->setChecked(Config::getBool(Config::KEY_MAIN_SHOWLTONTAGS, Config::ShowLOOnTagsDefault));
     ui->cbEnableMultiThreading->setChecked(_data->isMtEnabled());
     ui->cbLightTheme->setChecked(Config::getBool(Config::KEY_INFO_SHORTCUT_LIGHT_THEME, false));
+    ui->cbShowPathInElementTooltip->setChecked(Config::getBool(Config::KEY_ELEMENT_TEXT_TOOLTIP_PATH, true));
     updateStatus();
     _started = true ;
 }
@@ -287,6 +288,14 @@ void ConfigurationGeneralOptions::on_cbLightTheme_stateChanged(int /*state*/)
     Config::saveBool(Config::KEY_INFO_SHORTCUT_LIGHT_THEME, ui->cbLightTheme->isChecked());
 }
 
+void ConfigurationGeneralOptions::on_cbShowPathInElementTooltip_stateChanged(int /*state*/)
+{
+    if(!_started) {
+        return ;
+    }
+    Config::saveBool(Config::KEY_ELEMENT_TEXT_TOOLTIP_PATH, ui->cbShowPathInElementTooltip->isChecked());
+}
+
 void ConfigurationGeneralOptions::on_cbEnableMultiThreading_stateChanged(int /*state*/)
 {
     if(!_started) {

src/config/configurationgeneraloptions.h

@@ -75,6 +75,7 @@ private slots:
     void on_cbShowTagComplex_stateChanged(int /*state*/);
     void on_cbEnableMultiThreading_stateChanged(int /*state*/);
     void on_cbLightTheme_stateChanged(int /*state*/);
+    void on_cbShowPathInElementTooltip_stateChanged(int /*state*/);
     void on_cmdResetBehavior_clicked();
 };
 

src/config/configurationgeneraloptions.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>799</width>
-    <height>470</height>
+    <height>486</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -204,13 +204,6 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout_2">
-     <item row="0" column="0">
-      <widget class="QCheckBox" name="expandTreeAfterLoad">
-       <property name="text">
-        <string>Automatically expand editor tree when loading data</string>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="1">
       <layout class="QHBoxLayout" name="horizontalLayout_3">
        <item>
@@ -244,21 +237,56 @@
        </item>
       </layout>
      </item>
+     <item row="3" column="1">
+      <widget class="QCheckBox" name="cbShowTagComplex">
+       <property name="text">
+        <string>Show decorated element Tags</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QCheckBox" name="cbEnableMultiThreading">
+       <property name="text">
+        <string>Enable multithreading</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QToolButton" name="toolButton">
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QCheckBox" name="expandTreeAfterLoad">
+       <property name="text">
+        <string>Automatically expand editor tree when loading data</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QCheckBox" name="cbLightTheme">
+       <property name="text">
+        <string>Light theme</string>
+       </property>
+      </widget>
+     </item>
      <item row="1" column="0">
       <widget class="QCheckBox" name="cbShowImagesInTextTooltip">
        <property name="text">
         <string>Show images in text tooltip</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
+     <item row="3" column="0">
       <widget class="QCheckBox" name="cbOpenFilesInNewWindow">
        <property name="text">
         <string>Open files in new window</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
+     <item row="5" column="0">
       <widget class="QCheckBox" name="cbSingleInstance">
        <property name="text">
         <string>Single instance application</string>
@@ -272,24 +300,10 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
-      <widget class="QCheckBox" name="cbShowTagComplex">
-       <property name="text">
-        <string>Show decorated element Tags</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <widget class="QCheckBox" name="cbEnableMultiThreading">
-       <property name="text">
-        <string>Enable multithreading</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QCheckBox" name="cbLightTheme">
+     <item row="2" column="0">
+      <widget class="QCheckBox" name="cbShowPathInElementTooltip">
        <property name="text">
-        <string>Light theme</string>
+        <string>Show path in element tooltip</string>
        </property>
       </widget>
      </item>

src/element.cpp

@@ -520,7 +520,12 @@ QVariant Element::columnViewTooltipData(QHash<void *, QString> *mapDataAnon)
             attributesLabel += tr(" Attributes:\n");
         }
 
-        QString tooltip = tr("%1\npath: %2\n%3").arg(theTag).arg(thePath).arg(attributesLabel);
+        QString tooltip ;
+        if(Config::getBool(Config::KEY_ELEMENT_TEXT_TOOLTIP_PATH, true)) {
+            tooltip = tr("%1\npath: %2\n%3").arg(theTag).arg(thePath).arg(attributesLabel);
+        } else {
+            tooltip = tr("%1\n%2").arg(theTag).arg(attributesLabel);
+        }
         // sort case insensitive
         QList<Attribute*> attributesList = Element::sortAttributesList(this->attributes);
         QString imageData ;

src/qxmleditconfig.h

@@ -61,6 +61,7 @@ class LIBQXMLEDITSHARED_EXPORT Config
     static const QString KEY_ELEMENT_ELEMENTFONTITALIC;
     static const QString KEY_ELEMENT_ELEMENTFONTBOLD;
     static const QString KEY_ELEMENT_TEXT_TOOLTIP_IMAGE;
+    static const QString KEY_ELEMENT_TEXT_TOOLTIP_PATH;
     // mainview
     static const QString  KEY_MAIN_COMPACTVIEW;
     static const QString  KEY_MAIN_ONEATTRLINE;

test/testelement.cpp

@@ -38,7 +38,7 @@ TestElement::~TestElement()
 
 bool TestElement::testFast()
 {
-    return testHasText();
+    return testConfigTooltip();
 }
 
 
@@ -133,9 +133,49 @@ bool TestElement::testTooltip()
     if(!testSingleTooltip("11", 11, true)) {
         return false;
     }
+    if(!testConfigTooltip()) {
+        return false;
+    }
+    return true;
+}
+
+bool TestElement::testConfigTooltip()
+{
+    if(!testConfigTooltipInner(false, false, true)) {
+        return false;
+    }
+
+    if(!testConfigTooltipInner(true, false, false)) {
+        return false;
+    }
+    if(!testConfigTooltipInner(true, true, true)) {
+        return false;
+    }
     return true;
 }
 
+bool TestElement::testConfigTooltipInner(const bool setValue, const bool usePath, const bool expectedFoundPath)
+{
+    App app;
+    app.initNoWindow();
+    // setup data
+    Element element("A", "", NULL, NULL);
+    Element *elementB = new Element("B", "", NULL, &element);
+    element.addChild(elementB);
+    // setup config
+    if(setValue) {
+        Config::saveBool(Config::KEY_ELEMENT_TEXT_TOOLTIP_PATH, usePath);
+    }
+    QVariant toolTip = elementB->columnViewTooltipData(NULL);
+    const bool foundPath = toolTip.toString().contains("/A/B", Qt::CaseSensitive);
+    if(foundPath!=expectedFoundPath) {
+        return error(QString("Error tooltip inner for setValue:%1 usePath:%2 expectedFoundPath:%3")
+                     .arg(setValue).arg(usePath).arg(expectedFoundPath));
+    }
+    return true ;
+}
+
+
 static bool probeForImageData(const QString &data)
 {
     if(!data.startsWith("<html>")) {

test/testelement.h

@@ -36,6 +36,8 @@ class TestElement : public TestBase
     bool testNotHasTextComplex();
     bool testNotHasTextSingle();
     bool testParentPath();
+    bool testConfigTooltipInner(const bool setValue, const bool usePath, const bool expectedPath);
+    bool testConfigTooltip();
 public:
     TestElement();
     ~TestElement();

test/tst_qxmledit.cpp

@@ -1667,6 +1667,7 @@ void TestQXmlEdit::testNew()
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
     qInstallMessageHandler(msgHandler);
 #endif
+    testElement();
 }
 
 QTEST_MAIN(TestQXmlEdit)