removed 'MainMenu' bar from MainWindow

 - schedule is imported via 'conference' tab
 - about app is launched when user clicks 'info' button/icon

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index aa6aee5888fad15401cadd221659470286479898..ca1d17d38c67f01c1fe14ce1dde95a01157fcfca 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -48,10 +48,6 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
 
     connect(importScheduleWidget, SIGNAL(scheduleImported(int)), SLOT(scheduleImported(int)));
 
 
     connect(importScheduleWidget, SIGNAL(scheduleImported(int)), SLOT(scheduleImported(int)));
 

-    // connect Menu actions
-    connect(actionAboutQt, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
-    connect(actionAboutApplication, SIGNAL(triggered()), SLOT(aboutApp()));
-

     connect(dayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateDayView(const QDate &)));
     connect(trackDayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateTracksView(const QDate &)));
     connect(favouriteDayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateFavouritesView(const QDate &)));
     connect(dayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateDayView(const QDate &)));
     connect(trackDayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateTracksView(const QDate &)));
     connect(favouriteDayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateFavouritesView(const QDate &)));

diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index e1b2069215a2dc00478fdffe2221bf95e82dfaff..c2139f09a2495ae315e53b281b4cbb70ab3d3469 100644 (file)
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -23,7 +23,7 @@
     <item row="0" column="0" >
      <widget class="TabWidget" name="tabWidget" >
       <property name="currentIndex" >
     <item row="0" column="0" >
      <widget class="TabWidget" name="tabWidget" >
       <property name="currentIndex" >

-       <number>5</number>
+       <number>0</number>

       </property>
       <widget class="QWidget" name="dayViewTab" >
        <attribute name="title" >
       </property>
       <widget class="QWidget" name="dayViewTab" >
        <attribute name="title" >


@@ -547,53 +547,7 @@
     </item>
    </layout>
   </widget>
     </item>
    </layout>
   </widget>

-  <widget class="QMenuBar" name="menubar" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>935</width>
-     <height>26</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuFile" >
-    <property name="title" >
-     <string>File</string>
-    </property>
-    <addaction name="actionImportSchedule" />
-    <addaction name="actionQuit" />
-   </widget>
-   <widget class="QMenu" name="menuAbout" >
-    <property name="title" >
-     <string>Help</string>
-    </property>
-    <addaction name="actionAboutQt" />
-    <addaction name="actionAboutApplication" />
-   </widget>
-   <addaction name="menuAbout" />
-   <addaction name="menuFile" />
-  </widget>

   <widget class="QStatusBar" name="statusbar" />
   <widget class="QStatusBar" name="statusbar" />

-  <action name="actionImportSchedule" >
-   <property name="text" >
-    <string>Import Schedule</string>
-   </property>
-  </action>
-  <action name="actionAboutQt" >
-   <property name="text" >
-    <string>About Qt</string>
-   </property>
-  </action>
-  <action name="actionAboutApplication" >
-   <property name="text" >
-    <string>About application</string>
-   </property>
-  </action>
-  <action name="actionQuit" >
-   <property name="text" >
-    <string>Quit</string>
-   </property>
-  </action>

  </widget>
  <customwidgets>
   <customwidget>
  </widget>
  <customwidgets>
   <customwidget>


@@ -623,22 +577,5 @@
  <resources>
   <include location="../icons.qrc" />
  </resources>
  <resources>
   <include location="../icons.qrc" />
  </resources>

- <connections>
-  <connection>
-   <sender>actionQuit</sender>
-   <signal>triggered()</signal>
-   <receiver>MainWindow</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>266</x>
-     <y>187</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>

 </ui>
 </ui>