Ignore:
Timestamp:
10/05/11 00:11:03 (11 years ago)
Author:
Philipp Spitzer <philipp@…>
Branches:
master, qt5
Children:
dc66a91
Parents:
a9430aa
Message:

Removed the "Now" tab.
Removed the day navigator inside tabs.
Added a search button in the button bar.

Right now, at least the following does not work:

  • update of favorites
  • conflict editor
  • setting favorite in the event dialog
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gui/mainwindow.ui

    ra9430aa r264f5e7  
    3939     <widget class="QTabWidget" name="tabWidget">
    4040      <property name="currentIndex">
    41        <number>1</number>
     41       <number>0</number>
    4242      </property>
    4343      <property name="elideMode">
    4444       <enum>Qt::ElideRight</enum>
    4545      </property>
    46       <widget class="QWidget" name="nowTab">
    47        <attribute name="title">
    48         <string>Now</string>
    49        </attribute>
    50        <layout class="QGridLayout" name="gridLayout_7">
    51         <item row="0" column="0">
    52          <widget class="NowTabContainer" name="nowTabContainer" native="true"/>
    53         </item>
    54        </layout>
    55       </widget>
    5646      <widget class="QWidget" name="favouritesTab">
    5747       <attribute name="title">
    58         <string>Favourites</string>
     48        <string>&amp;Favourites</string>
    5949       </attribute>
    6050       <layout class="QGridLayout" name="gridLayout_3">
     
    6656      <widget class="QWidget" name="dayViewTab">
    6757       <attribute name="title">
    68         <string>Day View</string>
     58        <string>&amp;Days</string>
    6959       </attribute>
    7060       <layout class="QGridLayout" name="gridLayout">
     
    7666      <widget class="QWidget" name="tracksTab">
    7767       <attribute name="title">
    78         <string>Tracks</string>
     68        <string>&amp;Tracks</string>
    7969       </attribute>
    8070       <layout class="QGridLayout" name="gridLayout_4">
     
    8676      <widget class="QWidget" name="roomsTab">
    8777       <attribute name="title">
    88         <string>Rooms</string>
     78        <string>&amp;Rooms</string>
    8979       </attribute>
    9080       <layout class="QGridLayout" name="gridLayout_8">
     
    9686      <widget class="QWidget" name="searchTab">
    9787       <attribute name="title">
    98         <string>Search</string>
     88        <string>&amp;Search</string>
    9989       </attribute>
    10090       <layout class="QHBoxLayout" name="horizontalLayout_1">
     
    143133   </attribute>
    144134   <addaction name="reloadAction"/>
    145    <addaction name="actionNow"/>
     135   <addaction name="nowAction"/>
     136   <addaction name="searchAction"/>
    146137  </widget>
    147138  <action name="conferencesAction">
    148139   <property name="text">
    149     <string>Conferences</string>
     140    <string>C&amp;onferences</string>
     141   </property>
     142   <property name="shortcut">
     143    <string>Ctrl+O</string>
    150144   </property>
    151145  </action>
    152146  <action name="settingsAction">
    153147   <property name="text">
    154     <string>Settings</string>
     148    <string>S&amp;ettings</string>
     149   </property>
     150   <property name="shortcut">
     151    <string>Ctrl+E</string>
    155152   </property>
    156153  </action>
    157154  <action name="aboutAction">
    158155   <property name="text">
    159     <string>About</string>
     156    <string>&amp;About</string>
    160157   </property>
    161158  </action>
     
    163160   <property name="text">
    164161    <string>&amp;Quit</string>
     162   </property>
     163   <property name="shortcut">
     164    <string>Ctrl+Q</string>
    165165   </property>
    166166  </action>
     
    180180   </property>
    181181  </action>
    182   <action name="actionNow">
     182  <action name="nowAction">
    183183   <property name="icon">
    184184    <iconset resource="../icons.qrc">
     
    192192   </property>
    193193  </action>
     194  <action name="searchAction">
     195   <property name="icon">
     196    <iconset resource="../icons.qrc">
     197     <normaloff>:/icons/search.png</normaloff>:/icons/search.png</iconset>
     198   </property>
     199   <property name="text">
     200    <string>&amp;Search</string>
     201   </property>
     202   <property name="shortcut">
     203    <string>Ctrl+F</string>
     204   </property>
     205  </action>
    194206 </widget>
    195207 <customwidgets>
     
    220232  </customwidget>
    221233  <customwidget>
    222    <class>NowTabContainer</class>
    223    <extends>QWidget</extends>
    224    <header>nowtabcontainer.h</header>
    225   </customwidget>
    226   <customwidget>
    227234   <class>DayNavigatorWidget</class>
    228235   <extends>QWidget</extends>
    229236   <header>daynavigatorwidget.h</header>
     237   <container>1</container>
    230238  </customwidget>
    231239 </customwidgets>
Note: See TracChangeset for help on using the changeset viewer.