File 2002-better-welcomeview.patch of Package kate

Overview Repositories Revisions Requests Users Attributes Meta

File 2002-better-welcomeview.patch of Package kate (Revision b7d2ae64444632db4c3cf3a017839ace)

Currently displaying revision b7d2ae64444632db4c3cf3a017839ace , Show latest

diff --git a/apps/lib/kateviewmanager.cpp b/apps/lib/kateviewmanager.cpp
index 624819720b2955e9fce6f3aca59ece33cd15225f..c5a79b6cafc29d667739474048f8c2ac061dec0d 100644
--- a/apps/lib/kateviewmanager.cpp
+++ b/apps/lib/kateviewmanager.cpp
@@ -1773,6 +1773,7 @@ void KateViewManager::showWelcomeView()
 
     auto welcomeView = new WelcomeView(this);
     mainWindow()->addWidget(welcomeView);
+    welcomeView->findChild<QPushButton *>()->setFocus();
     m_welcomeViewAlreadyShown = true;
 }
 
@@ -1791,7 +1792,11 @@ void KateViewManager::triggerActiveViewFocus()
             return;
         }
         if (auto v = activeViewSpace()->currentWidget()) {
-            v->setFocus();
+            if (qobject_cast<WelcomeView *>(v)) {
+                v->findChild<QPushButton *>()->setFocus();
+            } else {
+                v->setFocus();
+            }
             return;
         }
     });
diff --git a/apps/lib/welcomeview/recentitemsmodel.cpp b/apps/lib/welcomeview/recentitemsmodel.cpp
index ebf2ce943fdbda4644a3c39fd4ede81ab95b67cd..5029db85f9e46ad5f70994e49a7e4db5fd5a99cc 100644
--- a/apps/lib/welcomeview/recentitemsmodel.cpp
+++ b/apps/lib/welcomeview/recentitemsmodel.cpp
@@ -9,6 +9,7 @@
 
 #include "ktexteditor_utils.h"
 
+#include <QFileInfo>
 #include <QMimeDatabase>
 
 RecentItemsModel::RecentItemsModel(QObject *parent)
@@ -53,10 +54,8 @@ void RecentItemsModel::refresh(const QList<QUrl> &urls)
     QIcon icon;
     QString name;
     for (const QUrl &url : urls) {
-        // lookup mime type without accessing file to avoid stall for e.g. NFS/SMB
-        const QMimeType mimeType = QMimeDatabase().mimeTypeForFile(url.path(), QMimeDatabase::MatchExtension);
-        if (url.isLocalFile() || !mimeType.isDefault()) {
-            icon = QIcon::fromTheme(mimeType.iconName());
+        if (url.isLocalFile()) {
+            icon = QIcon::fromTheme(QMimeDatabase().mimeTypeForFile(QFileInfo(url.toLocalFile())).iconName());
         } else {
             icon = QIcon::fromTheme(QStringLiteral("network-server"));
         }
diff --git a/apps/lib/welcomeview/welcomeview.cpp b/apps/lib/welcomeview/welcomeview.cpp
index 397e1d7e7b679a35bf50d45c0751de1ac7aada2c..12e1cb460e97f08ae5c00962b97b7e064216f9c0 100644
--- a/apps/lib/welcomeview/welcomeview.cpp
+++ b/apps/lib/welcomeview/welcomeview.cpp
@@ -163,7 +163,7 @@ bool WelcomeView::event(QEvent *event)
         updateButtons();
         break;
     case QEvent::Resize:
-        if (updateLayout()) {
+        if (updateLayout() && isVisible()) {
             return true;
         }
         break;
diff --git a/apps/lib/welcomeview/welcomeview.ui b/apps/lib/welcomeview/welcomeview.ui
index 3a68bedee548eb00eec5dd09f563cc7cb90e7435..f9276929eed352341a4654bcbc65a9458ba9ab99 100644
--- a/apps/lib/welcomeview/welcomeview.ui
+++ b/apps/lib/welcomeview/welcomeview.ui
@@ -221,6 +221,12 @@
               <property name="alternatingRowColors">
                <bool>true</bool>
               </property>
+              <property name="horizontalScrollBarPolicy">
+               <enum>Qt::ScrollBarAlwaysOff</enum>
+              </property>
+              <property name="textElideMode">
+               <enum>Qt::ElideMiddle</enum>
+              </property>
              </widget>
             </item>
             <item row="4" column="0">
@@ -381,6 +387,12 @@
               <property name="alternatingRowColors">
                <bool>true</bool>
               </property>
+              <property name="horizontalScrollBarPolicy">
+               <enum>Qt::ScrollBarAlwaysOff</enum>
+              </property>
+              <property name="textElideMode">
+               <enum>Qt::ElideMiddle</enum>
+              </property>
              </widget>
             </item>
             <item row="2" column="0">

Places

File 2002-better-welcomeview.patch of Package kate (Revision b7d2ae64444632db4c3cf3a017839ace)

Places