From 9e3af4a3a828a0c632ef07969005f46fd30bee63 Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Thu, 28 Apr 2016 09:02:51 +0200
Subject: CAN-Example: Change SettingsDialog to ConnectDialog

This simplifies the handling and makes it more like
how other CAN monitors behave.

* After startup, the connect dialog is shown
* If the dialog is accepted, the selected device
  is connected instantly
* To interrupt a connection, the disconnect action
  can be used
* To connect again, the action connect can be used

Change-Id: I47db596658e90cc0393981fba135cd6d89191f1a
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
---
 examples/serialbus/can/mainwindow.ui | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'examples/serialbus/can/mainwindow.ui')

diff --git a/examples/serialbus/can/mainwindow.ui b/examples/serialbus/can/mainwindow.ui
index cd3eec7..9700024 100644
--- a/examples/serialbus/can/mainwindow.ui
+++ b/examples/serialbus/can/mainwindow.ui
@@ -161,7 +161,7 @@ Otherwise, the standard format with 11 bit idenfier is used.</string>
      <x>0</x>
      <y>0</y>
      <width>551</width>
-     <height>23</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuCalls">
@@ -173,12 +173,6 @@ Otherwise, the standard format with 11 bit idenfier is used.</string>
     <addaction name="separator"/>
     <addaction name="actionQuit"/>
    </widget>
-   <widget class="QMenu" name="menuTools">
-    <property name="title">
-     <string>Too&amp;ls</string>
-    </property>
-    <addaction name="actionConfigure"/>
-   </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
      <string>Help</string>
@@ -186,7 +180,6 @@ Otherwise, the standard format with 11 bit idenfier is used.</string>
     <addaction name="actionAboutQt"/>
    </widget>
    <addaction name="menuCalls"/>
-   <addaction name="menuTools"/>
    <addaction name="menuHelp"/>
   </widget>
   <widget class="QToolBar" name="mainToolBar">
@@ -198,7 +191,6 @@ Otherwise, the standard format with 11 bit idenfier is used.</string>
    </attribute>
    <addaction name="actionConnect"/>
    <addaction name="actionDisconnect"/>
-   <addaction name="actionConfigure"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionConnect">
@@ -228,15 +220,6 @@ Otherwise, the standard format with 11 bit idenfier is used.</string>
     <string>&amp;Quit</string>
    </property>
   </action>
-  <action name="actionConfigure">
-   <property name="icon">
-    <iconset resource="can.qrc">
-     <normaloff>:/images/settings.png</normaloff>:/images/settings.png</iconset>
-   </property>
-   <property name="text">
-    <string>&amp;Configure</string>
-   </property>
-  </action>
   <action name="actionAboutQt">
    <property name="text">
     <string>&amp;About Qt</string>
-- 
cgit v1.2.3