fixed #49

andrew-bibb · Nov 15, 2014 · cf6c34d · cf6c34d
1 parent ca8bc3a
commit cf6c34d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/apps/cmstapp/code/control_box/controlbox.cpp b/apps/cmstapp/code/control_box/controlbox.cpp
@@ -2050,12 +2050,12 @@ void ControlBox::socketConnectionDetected()
 }   
 
 //
-// Slot to tidy up the place at close.  Called when the QApplication aboutToQuit() signal is emitted
+// Slot to tidy up the place at close.  Called when the QApplication::aboutToQuit() signal is emitted
 void ControlBox::cleanUp()
 {
   // close and delete the socket server
   socketserver->close();
-  delete socketserver;
+  socketserver->deleteLater();
 
   return;
 }

diff --git a/apps/cmstapp/code/control_box/ui/controlbox.ui b/apps/cmstapp/code/control_box/ui/controlbox.ui
@@ -441,8 +441,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>660</width>
-            <height>371</height>
+            <width>98</width>
+            <height>32</height>
            </rect>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_7">
@@ -670,8 +670,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>636</width>
-               <height>137</height>
+               <width>98</width>
+               <height>46</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -726,8 +726,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>636</width>
-               <height>136</height>
+               <width>98</width>
+               <height>46</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_10">
@@ -1045,8 +1045,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>550</width>
-            <height>449</height>
+            <width>98</width>
+            <height>412</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_8">
@@ -1102,7 +1102,7 @@
      <item>
       <widget class="QPushButton" name="pushButton_provisioning_editor">
        <property name="whatsThis">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Open the provisioning editor to create or edit Connman configuration (provisioning) files.&lt;/p&gt;&lt;p&gt;These config files reside in /var/lib/connman which is owned by root:root. CMST will register a roothelper to allow reading and writing files in this directory. As long as you are a member of the &amp;quot;network&amp;quot; group, which you must be to communicate with Connman via DBus, then CMST will communicate with the roothelper, also via DBus.&lt;/p&gt;&lt;p&gt;To avoid abusing the root privileges the editor will only operate on files with names ending in &lt;span style=&quot; font-style:italic;&quot;&gt;.cmst.config&lt;/span&gt;. This file name ending will be added automatically during a file save and cannot be altered. &lt;/p&gt;&lt;p&gt;Using this editor it is not possible to edit or delete config files created by other means.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Open the provisioning editor to create or edit Connman configuration (provisioning) files.&lt;/p&gt;&lt;p&gt;These config files reside in /var/lib/connman which is owned by root:root. CMST will register a roothelper to allow reading and writing files in this directory. &lt;/p&gt;&lt;p&gt;To avoid abusing the root privileges the editor will only operate on files with names ending in &lt;span style=&quot; font-style:italic;&quot;&gt;.cmst.config&lt;/span&gt;. This file name ending will be added automatically during a file save and cannot be altered. &lt;/p&gt;&lt;p&gt;Using this editor it is not possible to edit or delete config files created by other means.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>Provisioning Editor</string>

diff --git a/building_and_installing.txt b/building_and_installing.txt
@@ -32,6 +32,7 @@ us know what your network group is called and we'll add it in.
 
 Roothelper install file location:
 By default the roothelper (called cmstroothelper) will be installed in
-/usr/lib/cmst.  In Slackware /usr/lib is apparently not used so if you
-specify and export a variable called USE_LIBPATH pointing to your 
-install location that will be used instead.
+/usr/lib/cmst.  In Slackware /usr/lib is apparently not used for every
+architecture so if you specify and export a variable called USE_LIBPATH
+pointing to your install location that location will be used as the
+install target instead.