Skip to content

Commit

Permalink
Move some button icon configurations to UI files
Browse files Browse the repository at this point in the history
  • Loading branch information
@martinber
martinber committed Mar 23, 2020
1 parent c7384ef commit 5f7dffe
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 66 deletions.
11 changes: 0 additions & 11 deletions data/gui/normalStyle.css
View file
Expand Up @@ -174,12 +174,6 @@ QHeaderView::down-arrow {
image: url(:/graphicGui/uieSpindown.png);
}

/* TODO move to .ui or class */
#configurationDialogForm QPushButton#screenshotBrowseButton,
QPushButton#pushButtonPickExecutablesDirectory {
image: url(:/graphicGui/uibtFolder.png);
}

QMenu {
background-color: rgb(90, 90, 90); /* sets background of the menu */
border: 1px solid rgb(0, 0, 0);
Expand Down Expand Up @@ -941,11 +935,6 @@ QListWidget#satellitesList,
QListWidget#sourceList {
font-size: 60%;
}
/* TODO: Move to .ui file */
QPushButton#saveSatellitesButton {
image: url(:/graphicGui/uibtSave.png);
}


/**************************************************************************************************************
* TelescopeControl
Expand Down
5 changes: 0 additions & 5 deletions plugins/Satellites/src/gui/SatellitesDialog.cpp
View file
Expand Up @@ -121,14 +121,9 @@ void SatellitesDialog::createDialogContent()
}

// Set symbols on buttons
ui->addSatellitesButton->setText(QChar(0x2795)); // Heavy plus symbol
ui->removeSatellitesButton->setText(QChar(0x2796)); // Heavy minus symbol
ui->satMarkerColorPickerButton->setText(QChar(0x2740)); // Florette symbol
ui->satOrbitColorPickerButton->setText(QChar(0x2740)); // Florette symbol
ui->satInfoColorPickerButton->setText(QChar(0x2740)); // Florette symbol
ui->saveSatellitesButton->setText(QString());
ui->addSourceButton->setText(QChar(0x2795)); // Heavy plus symbol
ui->deleteSourceButton->setText(QChar(0x2796)); // Heavy minus symbol

// Settings tab / updates group
// These controls are refreshed by updateSettingsPage(), which in
Expand Down
37 changes: 26 additions & 11 deletions plugins/Satellites/src/gui/satellitesDialog.ui
View file
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>579</width>
<width>701</width>
<height>491</height>
</rect>
</property>
Expand Down Expand Up @@ -593,8 +593,10 @@
<property name="toolTip">
<string>Add more satellites</string>
</property>
<property name="text">
<string notr="true">Add</string>
<property name="icon">
<iconset resource="../../../../data/gui/guiRes.qrc">
<normaloff>:/graphicGui/uibtAdd.png</normaloff>
<disabledoff>:/graphicGui/uibtAdd-disabled.png</disabledoff>:/graphicGui/uibtAdd.png</iconset>
</property>
</widget>
</item>
Expand All @@ -609,8 +611,10 @@
<property name="toolTip">
<string>Remove the selected satellites</string>
</property>
<property name="text">
<string notr="true">Remove</string>
<property name="icon">
<iconset resource="../../../../data/gui/guiRes.qrc">
<normaloff>:/graphicGui/uibtRemove.png</normaloff>
<disabledoff>:/graphicGui/uibtRemove-disabled.png</disabledoff>:/graphicGui/uibtRemove.png</iconset>
</property>
</widget>
</item>
Expand Down Expand Up @@ -690,7 +694,12 @@
<string>Save changes</string>
</property>
<property name="text">
<string notr="true">Save</string>
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="../../../../data/gui/guiRes.qrc">
<normaloff>:/graphicGui/uibtSave.png</normaloff>
<disabledoff>:/graphicGui/uibtSave-disabled.png</disabledoff>:/graphicGui/uibtSave.png</iconset>
</property>
</widget>
</item>
Expand Down Expand Up @@ -919,8 +928,10 @@
<property name="toolTip">
<string>Add new source</string>
</property>
<property name="text">
<string notr="true">Add</string>
<property name="icon">
<iconset resource="../../../../data/gui/guiRes.qrc">
<normaloff>:/graphicGui/uibtAdd.png</normaloff>
<disabledoff>:/graphicGui/uibtAdd-disabled.png</disabledoff>:/graphicGui/uibtAdd.png</iconset>
</property>
</widget>
</item>
Expand All @@ -929,8 +940,10 @@
<property name="toolTip">
<string>Remove selected source</string>
</property>
<property name="text">
<string notr="true">Remove</string>
<property name="icon">
<iconset resource="../../../../data/gui/guiRes.qrc">
<normaloff>:/graphicGui/uibtRemove.png</normaloff>
<disabledoff>:/graphicGui/uibtRemove-disabled.png</disabledoff>:/graphicGui/uibtRemove.png</iconset>
</property>
</widget>
</item>
Expand Down Expand Up @@ -1088,7 +1101,9 @@
<tabstop>deleteSourceButton</tabstop>
<tabstop>aboutTextBrowser</tabstop>
</tabstops>
<resources/>
<resources>
<include location="../../../../data/gui/guiRes.qrc"/>
</resources>
<connections>
<connection>
<sender>checkBoxAutoAdd</sender>
Expand Down
76 changes: 37 additions & 39 deletions plugins/TelescopeControl/src/gui/telescopeDialog.ui
View file
Expand Up @@ -301,31 +301,21 @@
</property>
<item>
<widget class="QPushButton" name="pushButtonChangeStatus">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>24</height>
</size>
</property>
<property name="text">
<string>Start</string>
<property name="icon">
<iconset resource="../../../../data/gui/guiRes.qrc">
<normaloff>:/graphicGui/uibtStart.png</normaloff>
<disabledoff>:/graphicGui/uibtStart-disabled.png</disabledoff>:/graphicGui/uibtStart.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonConfigure">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
Expand All @@ -338,19 +328,15 @@
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
<string>Configure</string>
<property name="icon">
<iconset resource="../../../../data/gui/guiRes.qrc">
<normaloff>:/graphicGui/uibtSettings.png</normaloff>
<disabledoff>:/graphicGui/uibtSettings-disabled.png</disabledoff>:/graphicGui/uibtSettings.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonAdd">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
Expand All @@ -363,8 +349,10 @@
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
<string>Add</string>
<property name="icon">
<iconset resource="../../../../data/gui/guiRes.qrc">
<normaloff>:/graphicGui/uibtCreate.png</normaloff>
<disabledoff>:/graphicGui/uibtCreate-disabled.png</disabledoff>:/graphicGui/uibtCreate.png</iconset>
</property>
</widget>
</item>
Expand All @@ -373,12 +361,6 @@
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
Expand All @@ -388,11 +370,26 @@
<property name="toolTip">
<string>Remove the selected telescope</string>
</property>
<property name="text">
<string>Remove</string>
<property name="icon">
<iconset resource="../../../../data/gui/guiRes.qrc">
<normaloff>:/graphicGui/uibtDelete.png</normaloff>
<disabledoff>:/graphicGui/uibtDelete-disabled.png</disabledoff>:/graphicGui/uibtDelete.png</iconset>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -433,12 +430,6 @@
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QGroupBox" name="groupBoxGUI">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>GUI</string>
</property>
Expand Down Expand Up @@ -623,6 +614,11 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="icon">
<iconset resource="../../../../data/gui/guiRes.qrc">
<normaloff>:/graphicGui/uibtFolder.png</normaloff>
<disabledoff>:/graphicGui/uibtFolder-disabled.png</disabledoff>:/graphicGui/uibtFolder.png</iconset>
</property>
</widget>
</item>
</layout>
Expand Down Expand Up @@ -716,6 +712,8 @@
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<resources>
<include location="../../../../data/gui/guiRes.qrc"/>
</resources>
<connections/>
</ui>
5 changes: 5 additions & 0 deletions src/gui/configurationDialog.ui
View file
Expand Up @@ -2153,6 +2153,11 @@
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../data/gui/guiRes.qrc">
<normaloff>:/graphicGui/uibtFolder.png</normaloff>
<disabledoff>:/graphicGui/uibtFolder-disabled.png</disabledoff>:/graphicGui/uibtFolder.png</iconset>
</property>
</widget>
</item>
</layout>
Expand Down

0 comments on commit 5f7dffe

Please sign in to comment.