Fixed tab tooltips for special folders

tsujan · Apr 18, 2023 · ba895dd · ba895dd
1 parent 35e7824
commit ba895dd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -9,6 +9,7 @@ V1.4.0
  * Safeguard the file type filters of file dialogs from bad translations.
  * Added `application/x-zerosize` to the desktop file (after a change in GLib).
  * Added an option for showing window title on the menubar.
+ * Fixed the tab tooltip for special folders.
 
 V1.3.5
 ---------

diff --git a/NEWS b/NEWS
@@ -1,5 +1,5 @@
 Latest version:
 
-	13 Apr 2023, V1.4.0
+	18 Apr 2023, V1.4.0
 
 See "ChangeLog" for changes.
diff --git a/featherpad/about.ui b/featherpad/about.ui
@@ -149,7 +149,7 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Portuguese (Brazil):&lt;/span&gt; &lt;a href=&quot;https://github.com/eltonfabricio10&quot;&gt;eltonfabricio10 at GitHub&lt;/a&gt;, &lt;a href=&quot;https://github.com/alexandrecoliveira&quot;&gt;alexandrecoliveira at GitHub&lt;/a&gt;, Ruan O. Lima, Erik Kierski &lt;a href=&quot;https://github.com/erikferki&quot;&gt;(erikferki at GitHub)&lt;/a&gt;, &lt;a href=&quot;https://github.com/Cristian-Willian-dos-Santos&quot;&gt;Cristian-Willian-dos-Santos at GitHub&lt;/a&gt;, Daniel Araujo Domingues &lt;a href=&quot;https://github.com/dadomingues&quot;&gt;(dadomingues at GitHub)&lt;/a&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Russian:&lt;/span&gt; Vladimir Sharonin &lt;a href=&quot;https://github.com/Survolog&quot;&gt;(Survolog at GitHub)&lt;/a&gt;, &lt;a href=&quot;https://github.com/VaYurik&quot;&gt;VaYurik at GitHub&lt;/a&gt;, Pavel Shlyak &lt;a href=&quot;https://github.com/shlyakpavel&quot;&gt;(shlyakpavel at GitHub)&lt;/a&gt;, Schwonder Reismus &lt;a href=&quot;https://github.com/schw0reismus&quot;&gt;(schw0reismus at GitHub)&lt;/a&gt;, Николай Смольянинов &lt;a href=&quot;https://github.com/smolnp&quot;&gt;(smolnp at GitHub)&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Russian:&lt;/span&gt; Vladimir Sharonin &lt;a href=&quot;https://github.com/Survolog&quot;&gt;(Survolog at GitHub)&lt;/a&gt;, &lt;a href=&quot;https://github.com/VaYurik&quot;&gt;VaYurik at GitHub&lt;/a&gt;, Pavel Shlyak &lt;a href=&quot;https://github.com/shlyakpavel&quot;&gt;(shlyakpavel at GitHub)&lt;/a&gt;, Schwonder Reismus &lt;a href=&quot;https://github.com/schw0reismus&quot;&gt;(schw0reismus at GitHub)&lt;/a&gt;, Николай Смольянинов &lt;a href=&quot;https://github.com/smolnp&quot;&gt;(smolnp at GitHub)&lt;/a&gt;, Andrei Stepanov &lt;a href=&quot;https://github.com/adem4ik&quot;&gt;(adem4ik at GitHub)&lt;/a&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Slovak:&lt;/span&gt; Paolo Vigoroso, Ptrlw&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;

diff --git a/featherpad/fpwin.cpp b/featherpad/fpwin.cpp
@@ -2554,7 +2554,7 @@ void FPwin::addText (const QString& text, const QString& fileName, const QString
                         /* An Old comment not valid anymore: "The index may have changed because syntaxHighlighting()
                            waits for all events to be processed (but it won't change from here on)." */
                         ui->tabWidget->indexOf (tabPage) : -1);
-    QString tip (fInfo.absolutePath());
+    QString tip (fileName.contains ("/") ? fileName.section("/", 0, -2) : fInfo.absolutePath());
     if (!tip.endsWith ("/")) tip += "/";
     QFontMetrics metrics (QToolTip::font());
     QString elidedTip = "<p style='white-space:pre'>"
@@ -3372,7 +3372,7 @@ bool FPwin::saveFile (bool keepSyntax,
         textEdit->setLastModified (fInfo.lastModified());
         ui->actionReload->setDisabled (false);
         setTitle (fname);
-        QString tip (fInfo.absolutePath());
+        QString tip (fname.contains ("/") ? fname.section("/", 0, -2) : fInfo.absolutePath());
         if (!tip.endsWith ("/")) tip += "/";
         QFontMetrics metrics (QToolTip::font());
         QString elidedTip = "<p style='white-space:pre'>"
@@ -3559,7 +3559,7 @@ void FPwin::saveAsRoot (const QString& fileName, TabPage *tabPage,
                 textEdit->setLastModified (fInfo.lastModified());
                 ui->actionReload->setDisabled (false);
                 setTitle (fileName);
-                QString tip (fInfo.absolutePath());
+                QString tip (fileName.contains ("/") ? fileName.section("/", 0, -2) : fInfo.absolutePath());
                 if (!tip.endsWith ("/")) tip += "/";
                 QFontMetrics metrics (QToolTip::font());
                 QString elidedTip = "<p style='white-space:pre'>"