Changeset c5324ca
- Timestamp:
- 01/19/10 10:45:59 (13 years ago)
- Branches:
- master, qt5
- Children:
- ec67a0b
- Parents:
- 9afc0ee
- Location:
- src/gui
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gui/mainwindow.cpp
r9afc0ee rc5324ca 39 39 connect(dayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateDayView(const QDate &))); 40 40 connect(activityDayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateActivitiesDayView(const QDate &))); 41 //connect(tabWidget, SIGNAL(currentChanged(int)), SLOT(updateView(int)));42 41 43 42 // DAY EVENTS View … … 96 95 activityDayNavigator->setDates(aStartDate, aEndDate); 97 96 } 98 connect(static_cast<EventModel*>(dayTreeView->model()), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(updateFavView())); 99 connect( static_cast<EventModel*>(favTreeView->model()), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(updateFavView()));100 /* connect(static_cast<EventModel*>(favTreeView->model()), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(updateFavViewComplete()));*/ 97 98 connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateTab(int))); 99 101 100 } 102 101 … … 152 151 } 153 152 154 void MainWindow::updateDayView(const QDate &aDate)153 void MainWindow::updateDayView(const QDate aDate) 155 154 { 156 155 int confId = 1; 157 static_cast<EventModel*>(dayTreeView->model())->loadEvents( aDate,confId);156 static_cast<EventModel*>(dayTreeView->model())->loadEvents(Conference::getById(confId).start(),confId); 158 157 dayTreeView->reset(); 159 158 dayNavigator->show(); 160 159 } 161 160 162 void MainWindow::update FavView()161 void MainWindow::updateTab(const int n) 163 162 { 164 163 int confId = 1; 165 static_cast<EventModel*>(favTreeView->model())->loadFavEvents(Conference::getById(confId).start(),confId); 166 favTreeView->reset(); //Necessary reset: 167 // if favourite event unselected as favourite is the only one in its time, and reset is not produced, crashed 168 164 if(n) //index 1 of tabWidget: favouriteTab 165 { 166 static_cast<EventModel*>(favTreeView->model())->loadFavEvents(Conference::getById(confId).start(),confId); 167 favTreeView->reset(); 168 } 169 else //index 0 of tabWidget: dayViewTab 170 { 171 static_cast<EventModel*>(dayTreeView->model())->loadEvents(Conference::getById(confId).start(),confId); 172 dayTreeView->reset(); 173 } 174 //TODO: update of activitiesTab needed? 169 175 dayNavigator->show(); 170 176 } 171 177 172 /*173 void MainWindow::updateFavViewComplete()174 {175 int confId = 1;176 updateFavView();177 updateDayView(Conference::getById(confId).start());178 }179 */180 178 181 179 void MainWindow::updateActivitiesDayView(const QDate &aDate) -
src/gui/mainwindow.h
r9afc0ee rc5324ca 19 19 void showParsingProgress(int aStatus); 20 20 void aboutApp(); 21 void updateDayView(const QDate &aDate);22 void update FavView();21 void updateDayView(const QDate aDate); 22 void updateTab(const int n); 23 23 /*void updateFavViewComplete();*/ 24 24 void updateActivitiesDayView(const QDate &aDate); -
src/gui/mainwindow.ui
r9afc0ee rc5324ca 1 <ui version="4.0" > 1 <?xml version="1.0" encoding="UTF-8"?> 2 <ui version="4.0"> 2 3 <class>MainWindow</class> 3 <widget class="QMainWindow" name="MainWindow" 4 <property name="geometry" 4 <widget class="QMainWindow" name="MainWindow"> 5 <property name="geometry"> 5 6 <rect> 6 7 <x>0</x> … … 10 11 </rect> 11 12 </property> 12 <property name="windowTitle" 13 <property name="windowTitle"> 13 14 <string>MainWindow</string> 14 15 </property> 15 <widget class="QWidget" name="centralwidget" 16 <layout class="QGridLayout" name="gridLayout" 17 <item row="0" column="0" 18 <widget class="QTabWidget" name="tabWidget" 19 <property name="currentIndex" 16 <widget class="QWidget" name="centralwidget"> 17 <layout class="QGridLayout" name="gridLayout"> 18 <item row="0" column="0"> 19 <widget class="QTabWidget" name="tabWidget"> 20 <property name="currentIndex"> 20 21 <number>0</number> 21 22 </property> 22 <widget class="QWidget" name="dayViewTab" 23 <attribute name="title" 23 <widget class="QWidget" name="dayViewTab"> 24 <attribute name="title"> 24 25 <string>Day View</string> 25 26 </attribute> 26 <layout class="QGridLayout" name="gridLayout_2" 27 <item row="0" column="0" 28 <layout class="QVBoxLayout" name="verticalLayout" 27 <layout class="QGridLayout" name="gridLayout_2"> 28 <item row="0" column="0"> 29 <layout class="QVBoxLayout" name="verticalLayout"> 29 30 <item> 30 <widget class="DayNavigatorWidget" na tive="1" name="dayNavigator"/>31 <widget class="DayNavigatorWidget" name="dayNavigator" native="true"/> 31 32 </item> 32 33 <item> 33 <widget class="TreeView" name="dayTreeView" 34 <property name="maximumSize" 34 <widget class="TreeView" name="dayTreeView"> 35 <property name="maximumSize"> 35 36 <size> 36 37 <width>16777215</width> … … 44 45 </layout> 45 46 </widget> 46 <widget class="QWidget" name="favouritesTab" 47 <attribute name="title" 47 <widget class="QWidget" name="favouritesTab"> 48 <attribute name="title"> 48 49 <string>Favourites</string> 49 50 </attribute> 50 <layout class="QGridLayout" name="gridLayout_3" 51 <item row="0" column="0" 52 <widget class="TreeView" name="favTreeView" 51 <layout class="QGridLayout" name="gridLayout_3"> 52 <item row="0" column="0"> 53 <widget class="TreeView" name="favTreeView"/> 53 54 </item> 54 55 </layout> 55 56 </widget> 56 <widget class="QWidget" name="activitiesTab" 57 <attribute name="title" 57 <widget class="QWidget" name="activitiesTab"> 58 <attribute name="title"> 58 59 <string>Activities</string> 59 60 </attribute> 60 <layout class="QGridLayout" name="gridLayout_4" 61 <item row="0" column="0" 62 <layout class="QVBoxLayout" name="activitiesVerticalLayout" 61 <layout class="QGridLayout" name="gridLayout_4"> 62 <item row="0" column="0"> 63 <layout class="QVBoxLayout" name="activitiesVerticalLayout"> 63 64 <item> 64 <widget class="DayNavigatorWidget" na tive="1" name="activityDayNavigator"/>65 <widget class="DayNavigatorWidget" name="activityDayNavigator" native="true"/> 65 66 </item> 66 67 <item> 67 <widget class="TreeView" name="actTreeView" 68 <property name="maximumSize" 68 <widget class="TreeView" name="actTreeView"> 69 <property name="maximumSize"> 69 70 <size> 70 71 <width>16777215</width> … … 78 79 </layout> 79 80 </widget> 80 <widget class="QWidget" name="searchTab" 81 <attribute name="title" 81 <widget class="QWidget" name="searchTab"> 82 <attribute name="title"> 82 83 <string>Search</string> 83 84 </attribute> 84 85 </widget> 85 <widget class="QWidget" name="mapTab" 86 <attribute name="title" 86 <widget class="QWidget" name="mapTab"> 87 <attribute name="title"> 87 88 <string>Map</string> 88 89 </attribute> … … 92 93 </layout> 93 94 </widget> 94 <widget class="QMenuBar" name="menubar" 95 <property name="geometry" 95 <widget class="QMenuBar" name="menubar"> 96 <property name="geometry"> 96 97 <rect> 97 98 <x>0</x> 98 99 <y>0</y> 99 100 <width>534</width> 100 <height>2 2</height>101 <height>24</height> 101 102 </rect> 102 103 </property> 103 <widget class="QMenu" name="menuFile" 104 <property name="title" 104 <widget class="QMenu" name="menuFile"> 105 <property name="title"> 105 106 <string>File</string> 106 107 </property> 107 <addaction name="actionImportSchedule" 108 <addaction name="actionQuit" 108 <addaction name="actionImportSchedule"/> 109 <addaction name="actionQuit"/> 109 110 </widget> 110 <widget class="QMenu" name="menuAbout" 111 <property name="title" 111 <widget class="QMenu" name="menuAbout"> 112 <property name="title"> 112 113 <string>Help</string> 113 114 </property> 114 <addaction name="actionAboutQt" 115 <addaction name="actionAboutApplication" 115 <addaction name="actionAboutQt"/> 116 <addaction name="actionAboutApplication"/> 116 117 </widget> 117 <addaction name="menuAbout" 118 <addaction name="menuFile" 118 <addaction name="menuAbout"/> 119 <addaction name="menuFile"/> 119 120 </widget> 120 <widget class="QStatusBar" name="statusbar" 121 <action name="actionImportSchedule" 122 <property name="text" 121 <widget class="QStatusBar" name="statusbar"/> 122 <action name="actionImportSchedule"> 123 <property name="text"> 123 124 <string>Import Schedule</string> 124 125 </property> 125 126 </action> 126 <action name="actionAboutQt" 127 <property name="text" 127 <action name="actionAboutQt"> 128 <property name="text"> 128 129 <string>About Qt</string> 129 130 </property> 130 131 </action> 131 <action name="actionAboutApplication" 132 <property name="text" 132 <action name="actionAboutApplication"> 133 <property name="text"> 133 134 <string>About application</string> 134 135 </property> 135 136 </action> 136 <action name="actionQuit" 137 <property name="text" 137 <action name="actionQuit"> 138 <property name="text"> 138 139 <string>Quit</string> 139 140 </property> … … 161 162 <slot>close()</slot> 162 163 <hints> 163 <hint type="sourcelabel" 164 <hint type="sourcelabel"> 164 165 <x>-1</x> 165 166 <y>-1</y> 166 167 </hint> 167 <hint type="destinationlabel" 168 <hint type="destinationlabel"> 168 169 <x>266</x> 169 170 <y>187</y>
Note: See TracChangeset
for help on using the changeset viewer.