From 32dcecf1458b7fb9ec1141c0e5bcac96e7466dd7 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 27 May 2012 09:26:24 +0200
Subject: Application shortcut clean up

- no .desktop extension in desktop files
- set permissions bits as needed
- clean up setting UI
---
 src/application.cpp   |  7 +++++--
 src/webappcreation.ui | 19 ++++++++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index ef6c2085..02e13c72 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -68,6 +68,7 @@
 #include <KGlobal>
 #include <KCharsets>
 #include <KPushButton>
+#include <KMimeType>
 
 // Qt Includes
 #include <QVBoxLayout>
@@ -805,6 +806,7 @@ void Application::createWebAppShortcut()
     dialog->setCaption(i18nc("@title:window", "Create Application Shortcut"));
     dialog->setButtons(KDialog::Ok | KDialog::Cancel);
     dialog->button(KDialog::Ok)->setText(i18n("Create"));
+    dialog->setMinimumSize(400,50);
 
     Ui::webAppCreation wAppWidget;
     QWidget widget;
@@ -833,13 +835,13 @@ void Application::createWebAppShortcut()
                                  + QL1S("Icon=") + iconPath + QL1S("\n")
                                  + QL1S("Exec=kwebapp ") + u.url() + QL1S("\n")
                                  + QL1S("Type=Application\n")
-                                 + QL1S("Categories=Application;Network;WebBrowser\n")
+                                 + QL1S("Categories=Application;Network\n")
                                  ;
 
         if (ReKonfig::createDesktopAppShortcut())
         {
             QString desktop = KGlobalSettings::desktopPath();
-            QFile wAppFile(desktop + QL1C('/') + title + QL1S(".desktop"));
+            QFile wAppFile(desktop + QL1C('/') + title);
 
             if (!wAppFile.open(QIODevice::WriteOnly | QIODevice::Text))
             {
@@ -851,6 +853,7 @@ void Application::createWebAppShortcut()
             out.setCodec("UTF-8");
             out << shortcutString;
 
+            wAppFile.setPermissions(QFile::ReadUser|QFile::WriteUser|QFile::ExeUser|QFile::ReadGroup|QFile::ReadOther);
             wAppFile.close();
         }
 
diff --git a/src/webappcreation.ui b/src/webappcreation.ui
index 038326a8..2fc242b0 100644
--- a/src/webappcreation.ui
+++ b/src/webappcreation.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>445</width>
-    <height>151</height>
+    <width>461</width>
+    <height>196</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -41,6 +41,19 @@
      </item>
     </layout>
    </item>
+   <item>
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
@@ -58,7 +71,7 @@
    <item>
     <widget class="QCheckBox" name="kcfg_createMenuAppShortcut">
      <property name="text">
-      <string>Application Menù</string>
+      <string>Application Menu</string>
      </property>
     </widget>
    </item>
-- 
cgit v1.2.1