mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 10:40:42 +00:00
Separated Summary from Welcome into it's own tab, welcome has become Help Browser.
This commit is contained in:
Mark Watkins
parent
a244324aba
commit
6d921bbbe3
@ -36,5 +36,6 @@
|
||||
<file>icons/cubeoximeter.png</file>
|
||||
<file>icons/trophy.png</file>
|
||||
<file>icons/bookmark.png</file>
|
||||
<file>icons/help.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
BIN
icons/help.png
Normal file
BIN
icons/help.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
@ -120,8 +120,8 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
ui->tabWidget->insertTab(1,daily,STR_TR_Daily);
|
||||
|
||||
|
||||
// Start with the Welcome Tab
|
||||
ui->tabWidget->setCurrentWidget(ui->welcome); // setting this to daily shows the cube during loading..
|
||||
// Start with the Summary Tab
|
||||
ui->tabWidget->setCurrentWidget(ui->summaryTab); // setting this to daily shows the cube during loading..
|
||||
|
||||
// Nifty Notification popups in System Tray (uses Growl on Mac)
|
||||
if (QSystemTrayIcon::isSystemTrayAvailable() && QSystemTrayIcon::supportsMessages()) {
|
||||
@ -224,7 +224,7 @@ void MainWindow::Startup()
|
||||
}
|
||||
|
||||
|
||||
ui->tabWidget->setCurrentWidget(ui->welcome);
|
||||
ui->tabWidget->setCurrentWidget(ui->summaryTab);
|
||||
if (daily) daily->ReloadGraphs();
|
||||
if (overview) overview->ReloadGraphs();
|
||||
qprogress->hide();
|
||||
@ -351,11 +351,6 @@ QMenu * MainWindow::CreateMenu(QString title)
|
||||
return menu;
|
||||
}
|
||||
|
||||
void MainWindow::on_actionView_Welcome_triggered()
|
||||
{
|
||||
ui->tabWidget->setCurrentWidget(ui->welcome);
|
||||
}
|
||||
|
||||
void MainWindow::on_action_Fullscreen_triggered()
|
||||
{
|
||||
if (ui->action_Fullscreen->isChecked())
|
||||
@ -1004,7 +999,7 @@ void MainWindow::on_summaryButton_clicked()
|
||||
html+="</div>";
|
||||
}
|
||||
html+=htmlFooter();
|
||||
ui->webView->setHtml(html);
|
||||
ui->summaryView->setHtml(html);
|
||||
// QString file="qrc:/docs/index.html";
|
||||
// QUrl url(file);
|
||||
// ui->webView->setUrl(url);
|
||||
@ -1250,13 +1245,13 @@ void MainWindow::on_actionExp_ort_triggered()
|
||||
void MainWindow::on_actionOnline_Users_Guide_triggered()
|
||||
{
|
||||
ui->webView->load(QUrl("http://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=SleepyHead_Users_Guide"));
|
||||
ui->tabWidget->setCurrentIndex(0);
|
||||
ui->tabWidget->setCurrentWidget(ui->helpTab);
|
||||
}
|
||||
|
||||
void MainWindow::on_action_Frequently_Asked_Questions_triggered()
|
||||
{
|
||||
ui->webView->load(QUrl("http://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=Frequently_Asked_Questions"));
|
||||
ui->tabWidget->setCurrentIndex(0);
|
||||
ui->tabWidget->setCurrentWidget(ui->helpTab);
|
||||
}
|
||||
|
||||
void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date)
|
||||
@ -1950,7 +1945,7 @@ void MainWindow::keyPressEvent(QKeyEvent * event)
|
||||
|
||||
void MainWindow::on_summaryButton_2_clicked()
|
||||
{
|
||||
ui->tabWidget->setCurrentWidget(ui->welcome);
|
||||
ui->tabWidget->setCurrentWidget(ui->summaryTab);
|
||||
on_summaryButton_clicked();
|
||||
}
|
||||
|
||||
@ -1979,3 +1974,13 @@ void MainWindow::on_recordsBox_linkClicked(const QUrl &linkurl)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void MainWindow::on_helpButton_clicked()
|
||||
{
|
||||
ui->tabWidget->setCurrentWidget(ui->helpTab);
|
||||
}
|
||||
|
||||
void MainWindow::on_actionView_S_ummary_triggered()
|
||||
{
|
||||
ui->tabWidget->setCurrentWidget(ui->summaryTab);
|
||||
}
|
||||
|
||||
@ -135,9 +135,6 @@ private slots:
|
||||
*/
|
||||
void on_action_Import_Data_triggered();
|
||||
|
||||
//! \brief Selects the welcome page when it's clicked on
|
||||
void on_actionView_Welcome_triggered();
|
||||
|
||||
//! \brief Toggle Fullscreen (currently F11)
|
||||
void on_action_Fullscreen_triggered();
|
||||
|
||||
@ -250,6 +247,10 @@ private slots:
|
||||
|
||||
void on_recordsBox_linkClicked(const QUrl &arg1);
|
||||
|
||||
void on_helpButton_clicked();
|
||||
|
||||
void on_actionView_S_ummary_triggered();
|
||||
|
||||
private:
|
||||
|
||||
Ui::MainWindow *ui;
|
||||
|
||||
@ -78,7 +78,7 @@
|
||||
<enum>QTabWidget::North</enum>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="documentMode">
|
||||
<bool>false</bool>
|
||||
@ -89,7 +89,29 @@
|
||||
<property name="movable">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<widget class="QWidget" name="welcome">
|
||||
<widget class="QWidget" name="summaryTab">
|
||||
<attribute name="title">
|
||||
<string>&Summary</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_7">
|
||||
<property name="spacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QWebView" name="summaryView">
|
||||
<property name="url">
|
||||
<url>
|
||||
<string>about:blank</string>
|
||||
</url>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="helpTab">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
@ -97,7 +119,7 @@
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<attribute name="title">
|
||||
<string>&Summary</string>
|
||||
<string>&Help Browser</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
<property name="spacing">
|
||||
@ -213,13 +235,6 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QToolButton" name="summaryButton">
|
||||
<property name="text">
|
||||
<string>Summary</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="urlBar">
|
||||
<property name="editable">
|
||||
@ -399,9 +414,9 @@
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<y>-211</y>
|
||||
<width>143</width>
|
||||
<height>519</height>
|
||||
<height>524</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="palette">
|
||||
@ -528,8 +543,8 @@
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
<width>64</width>
|
||||
<height>64</height>
|
||||
<width>48</width>
|
||||
<height>48</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolButtonStyle">
|
||||
@ -568,8 +583,8 @@
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
<width>64</width>
|
||||
<height>64</height>
|
||||
<width>48</width>
|
||||
<height>48</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolButtonStyle">
|
||||
@ -597,8 +612,8 @@
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
<width>64</width>
|
||||
<height>64</height>
|
||||
<width>48</width>
|
||||
<height>48</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolButtonStyle">
|
||||
@ -626,8 +641,8 @@
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
<width>64</width>
|
||||
<height>64</height>
|
||||
<width>48</width>
|
||||
<height>48</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolButtonStyle">
|
||||
@ -661,8 +676,8 @@
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
<width>64</width>
|
||||
<height>64</height>
|
||||
<width>48</width>
|
||||
<height>48</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="checkable">
|
||||
@ -679,6 +694,35 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QToolButton" name="helpButton">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Help</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="Resources.qrc">
|
||||
<normaloff>:/icons/help.png</normaloff>:/icons/help.png</iconset>
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
<width>48</width>
|
||||
<height>48</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolButtonStyle">
|
||||
<enum>Qt::ToolButtonTextUnderIcon</enum>
|
||||
</property>
|
||||
<property name="autoRaise">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
@ -699,6 +743,7 @@
|
||||
<zorder>oximetryButton</zorder>
|
||||
<zorder>summaryButton_2</zorder>
|
||||
<zorder>importButton</zorder>
|
||||
<zorder>helpButton</zorder>
|
||||
</widget>
|
||||
<widget class="QWidget" name="page_2">
|
||||
<property name="geometry">
|
||||
@ -892,7 +937,7 @@
|
||||
<property name="title">
|
||||
<string>&View</string>
|
||||
</property>
|
||||
<addaction name="actionView_Welcome"/>
|
||||
<addaction name="actionView_S_ummary"/>
|
||||
<addaction name="actionView_Daily"/>
|
||||
<addaction name="actionView_Overview"/>
|
||||
<addaction name="actionView_O_ximetry"/>
|
||||
@ -1126,6 +1171,14 @@
|
||||
<string>F8</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionView_S_ummary">
|
||||
<property name="text">
|
||||
<string>View S&ummary</string>
|
||||
</property>
|
||||
<property name="shortcut">
|
||||
<string>F4</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user