Changeset 830f102 for src/gui


Ignore:
Timestamp:
01/26/10 14:12:41 (12 years ago)
Author:
pavelpa <pavelpa@…>
Branches:
master, qt5
Children:
6197713
Parents:
c15be10
Message:

removed 'MainMenu?' bar from MainWindow?

  • schedule is imported via 'conference' tab
  • about app is launched when user clicks 'info' button/icon
Location:
src/gui
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • src/gui/mainwindow.cpp

    rc15be10 r830f102  
    4848
    4949    connect(importScheduleWidget, SIGNAL(scheduleImported(int)), SLOT(scheduleImported(int)));
    50 
    51     // connect Menu actions
    52     connect(actionAboutQt, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
    53     connect(actionAboutApplication, SIGNAL(triggered()), SLOT(aboutApp()));
    5450
    5551    connect(dayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateDayView(const QDate &)));

  • src/gui/mainwindow.ui

    rc15be10 r830f102  
    2424     <widget class="TabWidget" name="tabWidget" >
    2525      <property name="currentIndex" >
    26        <number>5</number>
     26       <number>0</number>
    2727      </property>
    2828      <widget class="QWidget" name="dayViewTab" >
    … …  
    548548   </layout>
    549549  </widget>
    550   <widget class="QMenuBar" name="menubar" >
    551    <property name="geometry" >
    552     <rect>
    553      <x>0</x>
    554      <y>0</y>
    555      <width>935</width>
    556      <height>26</height>
    557     </rect>
    558    </property>
    559    <widget class="QMenu" name="menuFile" >
    560     <property name="title" >
    561      <string>File</string>
    562     </property>
    563     <addaction name="actionImportSchedule" />
    564     <addaction name="actionQuit" />
    565    </widget>
    566    <widget class="QMenu" name="menuAbout" >
    567     <property name="title" >
    568      <string>Help</string>
    569     </property>
    570     <addaction name="actionAboutQt" />
    571     <addaction name="actionAboutApplication" />
    572    </widget>
    573    <addaction name="menuAbout" />
    574    <addaction name="menuFile" />
    575   </widget>
    576550  <widget class="QStatusBar" name="statusbar" />
    577   <action name="actionImportSchedule" >
    578    <property name="text" >
    579     <string>Import Schedule</string>
    580    </property>
    581   </action>
    582   <action name="actionAboutQt" >
    583    <property name="text" >
    584     <string>About Qt</string>
    585    </property>
    586   </action>
    587   <action name="actionAboutApplication" >
    588    <property name="text" >
    589     <string>About application</string>
    590    </property>
    591   </action>
    592   <action name="actionQuit" >
    593    <property name="text" >
    594     <string>Quit</string>
    595    </property>
    596   </action>
    597551 </widget>
    598552 <customwidgets>
    … …  
    624578  <include location="../icons.qrc" />
    625579 </resources>
    626  <connections>
    627   <connection>
    628    <sender>actionQuit</sender>
    629    <signal>triggered()</signal>
    630    <receiver>MainWindow</receiver>
    631    <slot>close()</slot>
    632    <hints>
    633     <hint type="sourcelabel" >
    634      <x>-1</x>
    635      <y>-1</y>
    636     </hint>
    637     <hint type="destinationlabel" >
    638      <x>266</x>
    639      <y>187</y>
    640     </hint>
    641    </hints>
    642   </connection>
    643  </connections>
     580 <connections/>
    644581</ui>
Note: See TracChangeset for help on using the changeset viewer.