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

More minor GUI tweaks

Browse Source
This commit is contained in:
Mark Watkins 2014-05-17 22:20:06 +10:00
parent be6c04e619
commit 3f3e30b39a
2 changed files with 174 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sleepyhead/Graphs/gGraphView.cpp
View File

@ -840,11 +840,11 @@ bool gGraphView::renderGraphs(QPainter &painter)
if (m_showsplitter) { if (m_showsplitter) {
// draw the splitter handle // draw the splitter handle
painter.setPen(QColor(128,128,128,255)); painter.setPen(QColor(158,158,158,255));
painter.drawLine(0, py + h, w, py + h); painter.drawLine(0, py + h, w, py + h);
painter.setPen(QColor(192, 192, 192, 255)); painter.setPen(QColor(220, 220, 220, 255));
painter.drawLine(0, py + h + 1, w, py + h + 1); painter.drawLine(0, py + h + 1, w, py + h + 1);
painter.setPen(QColor(90, 90, 90, 255)); painter.setPen(QColor(140, 140, 140, 255));
painter.drawLine(0, py + h + 2, w, py + h + 2); painter.drawLine(0, py + h + 2, w, py + h + 2);
} }
@ -898,11 +898,11 @@ bool gGraphView::renderGraphs(QPainter &painter)
if (m_showsplitter) { if (m_showsplitter) {
// draw the splitter handle // draw the splitter handle
painter.setPen(QColor(128, 128, 128, 255)); painter.setPen(QColor(220, 220, 220, 255));
painter.drawLine(0, py + h, w, py + h); painter.drawLine(0, py + h, w, py + h);
painter.setPen(QColor(192, 192, 192, 255)); painter.setPen(QColor(128, 128, 128, 255));
painter.drawLine(0, py + h + 1, w, py + h + 1); painter.drawLine(0, py + h + 1, w, py + h + 1);
painter.setPen(QColor(90, 90, 90, 255)); painter.setPen(QColor(190, 190, 190, 255));
painter.drawLine(0, py + h + 2, w, py + h + 2); painter.drawLine(0, py + h + 2, w, py + h + 2);
} }

313
sleepyhead/mainwindow.ui
View File

@ -479,6 +479,9 @@
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="splitter">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
@ -920,7 +923,7 @@
<enum>QTabWidget::Triangular</enum> <enum>QTabWidget::Triangular</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<property name="documentMode"> <property name="documentMode">
<bool>false</bool> <bool>false</bool>
@ -1070,9 +1073,9 @@ color: yellow;</string>
<attribute name="title"> <attribute name="title">
<string>&amp;Help Browser</string> <string>&amp;Help Browser</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing"> <property name="spacing">
<number>3</number> <number>0</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
@ -1087,150 +1090,170 @@ color: yellow;</string>
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <widget class="QFrame" name="frame">
<property name="spacing"> <property name="sizePolicy">
<number>0</number> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<item> <property name="minimumSize">
<widget class="QFrame" name="frame"> <size>
<property name="sizePolicy"> <width>0</width>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> <height>40</height>
<horstretch>0</horstretch> </size>
<verstretch>0</verstretch> </property>
</sizepolicy> <property name="maximumSize">
</property> <size>
<property name="minimumSize"> <width>16777215</width>
<size> <height>40</height>
<width>0</width> </size>
<height>40</height> </property>
</size> <property name="frameShape">
</property> <enum>QFrame::NoFrame</enum>
<property name="maximumSize"> </property>
<size> <property name="frameShadow">
<width>16777215</width> <enum>QFrame::Plain</enum>
<height>40</height> </property>
</size> <layout class="QHBoxLayout" name="horizontalLayout_3">
</property> <property name="spacing">
<property name="frameShape"> <number>4</number>
<enum>QFrame::NoFrame</enum> </property>
</property> <property name="leftMargin">
<property name="frameShadow"> <number>6</number>
<enum>QFrame::Plain</enum> </property>
</property> <property name="topMargin">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <number>0</number>
<property name="spacing"> </property>
<number>0</number> <property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QToolButton" name="backButton">
<property name="text">
<string>...</string>
</property> </property>
<property name="leftMargin"> <property name="icon">
<number>6</number> <iconset resource="Resources.qrc">
<normaloff>:/icons/back.png</normaloff>:/icons/back.png</iconset>
</property> </property>
<property name="topMargin"> <property name="iconSize">
<number>0</number> <size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
<property name="rightMargin"> <property name="autoRaise">
<number>6</number> <bool>true</bool>
</property> </property>
<property name="bottomMargin"> </widget>
<number>0</number> </item>
<item>
<widget class="QToolButton" name="forwardButton">
<property name="text">
<string>...</string>
</property> </property>
<item> <property name="icon">
<widget class="QToolButton" name="backButton"> <iconset resource="Resources.qrc">
<property name="text"> <normaloff>:/icons/forward.png</normaloff>:/icons/forward.png</iconset>
<string>...</string> </property>
</property> <property name="iconSize">
<property name="icon"> <size>
<iconset resource="Resources.qrc"> <width>24</width>
<normaloff>:/icons/back.png</normaloff>:/icons/back.png</iconset> <height>24</height>
</property> </size>
<property name="iconSize"> </property>
<size> <property name="autoRaise">
<width>24</width> <bool>true</bool>
<height>24</height> </property>
</size> </widget>
</property> </item>
<property name="autoRaise"> <item>
<bool>true</bool> <widget class="QToolButton" name="homeButton">
</property> <property name="text">
</widget> <string>...</string>
</item> </property>
<item> <property name="icon">
<widget class="QToolButton" name="forwardButton"> <iconset resource="Resources.qrc">
<property name="text"> <normaloff>:/icons/go-home.png</normaloff>:/icons/go-home.png</iconset>
<string>...</string> </property>
</property> <property name="iconSize">
<property name="icon"> <size>
<iconset resource="Resources.qrc"> <width>24</width>
<normaloff>:/icons/forward.png</normaloff>:/icons/forward.png</iconset> <height>24</height>
</property> </size>
<property name="iconSize"> </property>
<size> <property name="autoRaise">
<width>24</width> <bool>true</bool>
<height>24</height> </property>
</size> </widget>
</property> </item>
<property name="autoRaise"> <item>
<bool>true</bool> <widget class="QComboBox" name="urlBar">
</property> <property name="editable">
</widget> <bool>true</bool>
</item> </property>
<item> </widget>
<widget class="QToolButton" name="homeButton"> </item>
<property name="text"> </layout>
<string>...</string> </widget>
</property> </item>
<property name="icon"> <item>
<iconset resource="Resources.qrc"> <widget class="QFrame" name="frame_4">
<normaloff>:/icons/go-home.png</normaloff>:/icons/go-home.png</iconset> <property name="frameShape">
</property> <enum>QFrame::StyledPanel</enum>
<property name="iconSize"> </property>
<size> <property name="frameShadow">
<width>24</width> <enum>QFrame::Raised</enum>
<height>24</height> </property>
</size> <layout class="QVBoxLayout" name="verticalLayout_4">
</property> <property name="spacing">
<property name="autoRaise"> <number>0</number>
<bool>true</bool> </property>
</property> <property name="leftMargin">
</widget> <number>0</number>
</item> </property>
<item> <property name="topMargin">
<widget class="QComboBox" name="urlBar"> <number>0</number>
<property name="editable"> </property>
<bool>true</bool> <property name="rightMargin">
</property> <number>0</number>
</widget> </property>
</item> <property name="bottomMargin">
</layout> <number>0</number>
</widget> </property>
</item> <item>
<item> <widget class="QWebView" name="webView">
<widget class="QWebView" name="webView"> <property name="sizePolicy">
<property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch>
<horstretch>0</horstretch> <verstretch>0</verstretch>
<verstretch>0</verstretch> </sizepolicy>
</sizepolicy> </property>
</property> <property name="minimumSize">
<property name="minimumSize"> <size>
<size> <width>0</width>
<width>0</width> <height>200</height>
<height>200</height> </size>
</size> </property>
</property> <property name="baseSize">
<property name="baseSize"> <size>
<size> <width>0</width>
<width>0</width> <height>200</height>
<height>200</height> </size>
</size> </property>
</property> <property name="url">
<property name="url"> <url>
<url> <string>qrc:/docs/index.html</string>
<string>qrc:/docs/index.html</string> </url>
</url> </property>
</property> </widget>
</widget> </item>
</item> </layout>
</layout> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -1821,8 +1844,8 @@ border: 2px solid #56789a; border-radius: 30px;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>100</width> <width>180</width>
<height>30</height> <height>596</height>
</rect> </rect>
</property> </property>
<property name="palette"> <property name="palette">
@ -2969,8 +2992,8 @@ border-radius: 10px;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>100</width> <width>180</width>
<height>30</height> <height>596</height>
</rect> </rect>
</property> </property>
<property name="mouseTracking"> <property name="mouseTracking">