Skip to content

Commit

Permalink
Merge pull request BlueQuartzSoftware#58 from imikejackson/develop
Browse files Browse the repository at this point in the history
Updating UI for the UpdateCheck dialog window.
  • Loading branch information
imikejackson committed May 22, 2017
2 parents bb16dbf + a25c5fc commit 7e6c2df
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 53 deletions.
70 changes: 20 additions & 50 deletions Source/SVWidgetsLib/Dialogs/UI_Files/UpdateCheckDialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>425</width>
<height>258</height>
<width>494</width>
<height>177</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -27,16 +27,16 @@
<number>4</number>
</property>
<property name="leftMargin">
<number>12</number>
<number>4</number>
</property>
<property name="topMargin">
<number>6</number>
<number>4</number>
</property>
<property name="rightMargin">
<number>12</number>
<number>4</number>
</property>
<property name="bottomMargin">
<number>6</number>
<number>4</number>
</property>
<item>
<layout class="QGridLayout" name="widgetLayout">
Expand Down Expand Up @@ -72,37 +72,6 @@
</attribute>
</widget>
</item>
<item row="0" column="0" rowspan="2">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>64</width>
<height>64</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>64</width>
<height>64</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../../../Resources/icons/images/Icons.qrc">:/SIMPLView.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QRadioButton" name="automatically">
<property name="text">
Expand All @@ -113,19 +82,6 @@
</attribute>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QLabel" name="messageLabel">
<property name="styleSheet">
<string notr="true">QLabel {
font-weight: bold;
font-size: 12px;
}</string>
</property>
<property name="text">
<string>How would you like to check for updates?</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="bottomMargin">
Expand Down Expand Up @@ -153,6 +109,19 @@ font-size: 12px;
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="messageLabel">
<property name="styleSheet">
<string notr="true">QLabel {
font-weight: bold;
font-size: 12px;
}</string>
</property>
<property name="text">
<string>How would you like to check for updates?</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
Expand Down Expand Up @@ -257,6 +226,7 @@ font-size: 12px;
</widget>
<resources>
<include location="../../../../Resources/icons/images/Icons.qrc"/>
<include location="../../icons/images/Icons.qrc"/>
</resources>
<connections>
<connection>
Expand Down
6 changes: 3 additions & 3 deletions Source/SVWidgetsLib/Widgets/SVPipelineViewWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -329,9 +329,9 @@ void SVPipelineViewWidget::newEmptyPipelineViewLayout()
QTextStream ss(&text);
ss << "<h2>Creating a Pipeline</h2>";
ss << "<hr>";
ss << "File > Open <br />";
ss << "File > New <br />";
ss << "Drag and drop filters<br />";
ss << "File -> Open <br />";
ss << "File -> New <br />";
ss << "Drag and drop filters here<br />";
ss << "Double click a Bookmark<br />";
ss << "Double click a Prebuilt Pipeline<br />";
m_EmptyPipelineLabel->setText(text);
Expand Down
2 changes: 2 additions & 0 deletions Source/SVWidgetsLib/icons/images/Icons.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
<file>search_menu.png</file>
<file>search_menu@2x.png</file>

<file>cloud_download.png</file>
<file>cloud_download@2x.png</file>

<file>arrow_down_green.png</file>
<file>arrow_down_green@2x.png</file>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions Source/SVWidgetsLib/icons/svg/cloud_download.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7e6c2df

Please sign in to comment.