Hooked up shadow controls in object editor.

This commit is contained in:
Jim Evins
2015-08-19 18:16:54 -04:00
parent d2b5822567
commit b614d8dacb
3 changed files with 46 additions and 6 deletions
+37
View File
@@ -42,6 +42,7 @@ namespace glabels
lineColorButton->init( "No line", QColor(0,0,0,0), QColor(0,0,0,255) ); lineColorButton->init( "No line", QColor(0,0,0,0), QColor(0,0,0,255) );
fillColorButton->init( "No fill", QColor(0,0,0,0), QColor(0,0,0,255) ); fillColorButton->init( "No fill", QColor(0,0,0,0), QColor(0,0,0,255) );
shadowColorButton->init( "Default", QColor(0,0,0,255), QColor(0,0,0,255) );
setEnabled( false ); setEnabled( false );
hidePages(); hidePages();
@@ -114,6 +115,23 @@ namespace glabels
} }
void ObjectEditor::loadShadowPage()
{
if ( mObject )
{
mBlocked = true;
shadowEnableCheck->setChecked( mObject->shadow() );
shadowXSpin->setValue( mObject->shadowX() );
shadowYSpin->setValue( mObject->shadowY() );
shadowColorButton->setColorNode( mObject->shadowColorNode() );
shadowOpacitySpin->setValue( 100*mObject->shadowOpacity() );
mBlocked = false;
}
}
void ObjectEditor::onLabelSizeChanged() void ObjectEditor::onLabelSizeChanged()
{ {
if ( mModel ) if ( mModel )
@@ -161,6 +179,7 @@ namespace glabels
loadLineFillPage(); loadLineFillPage();
loadPositionPage(); loadPositionPage();
loadRectSizePage(); loadRectSizePage();
loadShadowPage();
setEnabled( true ); setEnabled( true );
} }
@@ -190,6 +209,7 @@ namespace glabels
{ {
loadLineFillPage(); loadLineFillPage();
loadRectSizePage(); loadRectSizePage();
loadShadowPage();
} }
} }
@@ -272,6 +292,23 @@ namespace glabels
} }
void ObjectEditor::onShadowControlsChanged()
{
if ( !mBlocked )
{
mBlocked = true;
mObject->setShadow( shadowEnableCheck->isChecked() );
mObject->setShadowX( shadowXSpin->value() );
mObject->setShadowY( shadowYSpin->value() );
mObject->setShadowColorNode( shadowColorButton->colorNode() );
mObject->setShadowOpacity( shadowOpacitySpin->value()/100.0 );
mBlocked = false;
}
}
void ObjectEditor::onChanged() void ObjectEditor::onChanged()
{ {
if ( !mBlocked ) if ( !mBlocked )
+2
View File
@@ -59,6 +59,7 @@ namespace glabels
void loadLineFillPage(); void loadLineFillPage();
void loadPositionPage(); void loadPositionPage();
void loadRectSizePage(); void loadRectSizePage();
void loadShadowPage();
///////////////////////////////// /////////////////////////////////
@@ -74,6 +75,7 @@ namespace glabels
void onFillControlsChanged(); void onFillControlsChanged();
void onPositionControlsChanged(); void onPositionControlsChanged();
void onRectSizeControlsChanged(); void onRectSizeControlsChanged();
void onShadowControlsChanged();
void onChanged(); void onChanged();
+7 -6
View File
@@ -70,7 +70,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QTabWidget" name="notebook"> <widget class="QTabWidget" name="notebook">
<property name="currentIndex"> <property name="currentIndex">
<number>4</number> <number>5</number>
</property> </property>
<widget class="QWidget" name="textPage"> <widget class="QWidget" name="textPage">
<attribute name="title"> <attribute name="title">
@@ -1979,7 +1979,7 @@
<sender>shadowEnableCheck</sender> <sender>shadowEnableCheck</sender>
<signal>toggled(bool)</signal> <signal>toggled(bool)</signal>
<receiver>ObjectEditor</receiver> <receiver>ObjectEditor</receiver>
<slot>onChanged()</slot> <slot>onShadowControlsChanged()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>58</x> <x>58</x>
@@ -1995,7 +1995,7 @@
<sender>shadowXSpin</sender> <sender>shadowXSpin</sender>
<signal>valueChanged(double)</signal> <signal>valueChanged(double)</signal>
<receiver>ObjectEditor</receiver> <receiver>ObjectEditor</receiver>
<slot>onChanged()</slot> <slot>onShadowControlsChanged()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>125</x> <x>125</x>
@@ -2011,7 +2011,7 @@
<sender>shadowYSpin</sender> <sender>shadowYSpin</sender>
<signal>valueChanged(double)</signal> <signal>valueChanged(double)</signal>
<receiver>ObjectEditor</receiver> <receiver>ObjectEditor</receiver>
<slot>onChanged()</slot> <slot>onShadowControlsChanged()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>147</x> <x>147</x>
@@ -2027,7 +2027,7 @@
<sender>shadowColorButton</sender> <sender>shadowColorButton</sender>
<signal>colorChanged()</signal> <signal>colorChanged()</signal>
<receiver>ObjectEditor</receiver> <receiver>ObjectEditor</receiver>
<slot>onChanged()</slot> <slot>onShadowControlsChanged()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>106</x> <x>106</x>
@@ -2043,7 +2043,7 @@
<sender>shadowOpacitySpin</sender> <sender>shadowOpacitySpin</sender>
<signal>valueChanged(int)</signal> <signal>valueChanged(int)</signal>
<receiver>ObjectEditor</receiver> <receiver>ObjectEditor</receiver>
<slot>onChanged()</slot> <slot>onShadowControlsChanged()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>115</x> <x>115</x>
@@ -2063,5 +2063,6 @@
<slot>onFillControlsChanged()</slot> <slot>onFillControlsChanged()</slot>
<slot>onPositionControlsChanged()</slot> <slot>onPositionControlsChanged()</slot>
<slot>onRectSizeControlsChanged()</slot> <slot>onRectSizeControlsChanged()</slot>
<slot>onShadowControlsChanged()</slot>
</slots> </slots>
</ui> </ui>