chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Pie Chart option from Preferences dialog to View menu.

Browse Source
This commit is contained in:
Seeker4 2019-07-13 14:53:57 -07:00
parent 14611bd591
commit 39542ba7db
5 changed files with 61 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
oscar/mainwindow.cpp
View File

@ -122,7 +122,8 @@ void MainWindow::SetupGUI()
ui->action_Preferences->setShortcuts(QKeySequence::Preferences);
#endif
ui->actionToggle_Line_Cursor->setChecked(AppSetting->lineCursorMode());
ui->actionLine_Cursor->setChecked(AppSetting->lineCursorMode());
ui->actionPie_Chart->setChecked(AppSetting->graphSnapshots());
ui->actionDebug->setChecked(AppSetting->showDebug());
ui->actionShow_Performance_Counters->setChecked(AppSetting->showPerformance());
@ -2451,7 +2452,7 @@ void MainWindow::on_importButton_clicked()
}
void MainWindow::on_actionToggle_Line_Cursor_toggled(bool b)
void MainWindow::on_actionLine_Cursor_toggled(bool b)
{
AppSetting->setLineCursorMode(b);
if (ui->tabWidget->currentWidget() == daily) {
@ -2461,6 +2462,14 @@ void MainWindow::on_actionToggle_Line_Cursor_toggled(bool b)
}
}
void MainWindow::on_actionPie_Chart_toggled(bool visible)
{
AppSetting->setGraphSnapshots(visible);
if (daily && ui->tabWidget->currentWidget() == daily) {
daily->ReloadGraphs();
}
}
void MainWindow::on_actionLeft_Daily_Sidebar_toggled(bool visible)
{
if (daily) daily->setSidebarVisible(visible);

4
oscar/mainwindow.h
View File

@ -305,12 +305,14 @@ class MainWindow : public QMainWindow
void on_importButton_clicked();
void on_actionToggle_Line_Cursor_toggled(bool arg1);
void on_actionLine_Cursor_toggled(bool arg1);
void on_actionLeft_Daily_Sidebar_toggled(bool arg1);
void on_actionDaily_Calendar_toggled(bool arg1);
void on_actionPie_Chart_toggled(bool arg1);
void on_actionExport_Journal_triggered();
void on_actionShow_Performance_Counters_toggled(bool arg1);

52
oscar/mainwindow.ui
View File

@ -2838,7 +2838,8 @@ p, li { white-space: pre-wrap; }
<addaction name="separator"/>
<addaction name="action_Reset_Graph_Layout"/>
<addaction name="separator"/>
<addaction name="actionToggle_Line_Cursor"/>
<addaction name="actionLine_Cursor"/>
<addaction name="actionPie_Chart"/>
<addaction name="actionLeft_Daily_Sidebar"/>
<addaction name="actionDaily_Calendar"/>
<addaction name="action_Sidebar_Toggle"/>
@ -2932,6 +2933,9 @@ p, li { white-space: pre-wrap; }
<property name="text">
<string>View &amp;Daily</string>
</property>
<property name="toolTip">
<string>Show Daily view</string>
</property>
<property name="shortcut">
<string notr="true">F5</string>
</property>
@ -2940,6 +2944,9 @@ p, li { white-space: pre-wrap; }
<property name="text">
<string>View &amp;Overview</string>
</property>
<property name="toolTip">
<string>Show Overview view</string>
</property>
<property name="shortcut">
<string notr="true">F6</string>
</property>
@ -2980,6 +2987,9 @@ p, li { white-space: pre-wrap; }
<property name="text">
<string>&amp;Maximize Toggle</string>
</property>
<property name="toolTip">
<string>Maximize window</string>
</property>
<property name="shortcut">
<string notr="true">F11</string>
</property>
@ -2999,6 +3009,9 @@ p, li { white-space: pre-wrap; }
<property name="text">
<string>&amp;Reset Graph Layout</string>
</property>
<property name="toolTip">
<string>Reset sizes of graphs</string>
</property>
</action>
<action name="action_Screenshot">
<property name="text">
@ -3055,12 +3068,12 @@ p, li { white-space: pre-wrap; }
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>Right &amp;Sidebar</string>
</property>
<property name="toolTip">
<string>Show Right Sidebar</string>
</property>
<property name="shortcut">
<string notr="true">F10</string>
</property>
@ -3073,7 +3086,7 @@ p, li { white-space: pre-wrap; }
<string>View Statistics</string>
</property>
<property name="toolTip">
<string>View Statistics</string>
<string>Show Statistics view</string>
</property>
<property name="shortcut">
<string notr="true">F4</string>
@ -3114,7 +3127,7 @@ p, li { white-space: pre-wrap; }
<string>Current Days</string>
</property>
</action>
<action name="actionToggle_Line_Cursor">
<action name="actionLine_Cursor">
<property name="checkable">
<bool>true</bool>
</property>
@ -3135,11 +3148,14 @@ p, li { white-space: pre-wrap; }
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="text">
<string>Daily Sidebar</string>
</property>
<property name="toolTip">
<string>Show Daily Left Sidebar</string>
</property>
<property name="shortcut">
<string notr="true">F8</string>
</property>
@ -3149,11 +3165,14 @@ p, li { white-space: pre-wrap; }
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="text">
<string>Daily Calendar</string>
</property>
<property name="toolTip">
<string>Show Daily Calendar</string>
</property>
<property name="shortcut">
<string notr="true">F9</string>
</property>
@ -3191,6 +3210,23 @@ p, li { white-space: pre-wrap; }
<string>System Information</string>
</property>
</action>
<action name="actionPie_Chart">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<property name="text">
<string>Toggle &amp;Pie Chart</string>
</property>
<property name="toolTip">
<string>Show Pie Chart on Daily page</string>
</property>
<property name="shortcut">
<string>Ctrl+P</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>

4
oscar/preferencesdialog.cpp
View File

@ -210,7 +210,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
ui->useAntiAliasing->setChecked(AppSetting->antiAliasing());
ui->usePixmapCaching->setChecked(AppSetting->usePixmapCaching());
ui->useSquareWavePlots->setChecked(AppSetting->squareWavePlots());
ui->enableGraphSnapshots->setChecked(AppSetting->graphSnapshots());
// ui->enableGraphSnapshots->setChecked(AppSetting->graphSnapshots());
ui->graphTooltips->setChecked(AppSetting->graphTooltips());
ui->allowYAxisScaling->setChecked(AppSetting->allowYAxisScaling());
@ -808,7 +808,7 @@ bool PreferencesDialog::Save()
AppSetting->setAntiAliasing(ui->useAntiAliasing->isChecked());
AppSetting->setUsePixmapCaching(ui->usePixmapCaching->isChecked());
AppSetting->setSquareWavePlots(ui->useSquareWavePlots->isChecked());
AppSetting->setGraphSnapshots(ui->enableGraphSnapshots->isChecked());
// AppSetting->setGraphSnapshots(ui->enableGraphSnapshots->isChecked());
AppSetting->setLineThickness(float(ui->lineThicknessSlider->value()) / 2.0);
profile->general->setSkipEmptyDays(ui->skipEmptyDays->isChecked());

16
oscar/preferencesdialog.ui
View File

@ -57,7 +57,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="importTab">
<attribute name="title">
@ -2651,20 +2651,6 @@ Try it and see if you like it.</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="enableGraphSnapshots">
<property name="toolTip">
<string>Allows graphs to be &quot;screenshotted&quot; for display purposes.
The Event Breakdown PIE chart uses this method, as does
the printing code.
Unfortunately some older computers/versions of Qt can cause
this application to be unstable with this feature enabled.</string>
</property>
<property name="text">
<string>Show event breakdown pie chart</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="usePixmapCaching">
<property name="toolTip">