Skip to content

Commit 8ec0a01

Browse files
author
timlinux
committed
Backported disable labels options when labels are not checked to stable branch
git-svn-id: http://svn.osgeo.org/qgis/branches/Version-1_0@10396 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 1428003 commit 8ec0a01

File tree

2 files changed

+74
-89
lines changed

2 files changed

+74
-89
lines changed

‎src/app/qgsvectorlayerproperties.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@ void QgsVectorLayerProperties::reset( void )
447447
actionDialog->init();
448448
labelDialog->init();
449449
labelCheckBox->setChecked( layer->hasLabelsEnabled() );
450+
labelOptionsFrame->setEnabled ( layer->hasLabelsEnabled() );
450451
//set the transparency slider
451452
sliderTransparency->setValue( 255 - layer->getTransparency() );
452453
//update the transparency percentage label

‎src/ui/qgsvectorlayerpropertiesbase.ui

+73-89
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
<string>Layer Properties</string>
2020
</property>
2121
<property name="windowIcon" >
22-
<iconset>
23-
<normaloff/>
24-
</iconset>
22+
<iconset/>
2523
</property>
2624
<property name="modal" >
2725
<bool>true</bool>
@@ -32,7 +30,16 @@
3230
<property name="spacing" >
3331
<number>3</number>
3432
</property>
35-
<property name="margin" >
33+
<property name="leftMargin" >
34+
<number>1</number>
35+
</property>
36+
<property name="topMargin" >
37+
<number>1</number>
38+
</property>
39+
<property name="rightMargin" >
40+
<number>1</number>
41+
</property>
42+
<property name="bottomMargin" >
3643
<number>1</number>
3744
</property>
3845
<item>
@@ -71,7 +78,7 @@
7178
<enum>Qt::Horizontal</enum>
7279
</property>
7380
<property name="standardButtons" >
74-
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
81+
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
7582
</property>
7683
</widget>
7784
</item>
@@ -93,17 +100,9 @@
93100
<enum>QTabWidget::Rounded</enum>
94101
</property>
95102
<property name="currentIndex" >
96-
<number>5</number>
103+
<number>3</number>
97104
</property>
98105
<widget class="QWidget" name="tab1" >
99-
<property name="geometry" >
100-
<rect>
101-
<x>0</x>
102-
<y>0</y>
103-
<width>817</width>
104-
<height>557</height>
105-
</rect>
106-
</property>
107106
<attribute name="title" >
108107
<string>General</string>
109108
</attribute>
@@ -183,7 +182,16 @@
183182
<bool>true</bool>
184183
</property>
185184
<layout class="QGridLayout" >
186-
<property name="margin" >
185+
<property name="leftMargin" >
186+
<number>11</number>
187+
</property>
188+
<property name="topMargin" >
189+
<number>11</number>
190+
</property>
191+
<property name="rightMargin" >
192+
<number>11</number>
193+
</property>
194+
<property name="bottomMargin" >
187195
<number>11</number>
188196
</property>
189197
<item row="0" column="2" >
@@ -241,7 +249,16 @@
241249
<string>Subset</string>
242250
</property>
243251
<layout class="QGridLayout" >
244-
<property name="margin" >
252+
<property name="leftMargin" >
253+
<number>11</number>
254+
</property>
255+
<property name="topMargin" >
256+
<number>11</number>
257+
</property>
258+
<property name="rightMargin" >
259+
<number>11</number>
260+
</property>
261+
<property name="bottomMargin" >
245262
<number>11</number>
246263
</property>
247264
<item row="0" column="0" colspan="2" >
@@ -265,7 +282,7 @@
265282
<property name="sizeType" >
266283
<enum>QSizePolicy::Expanding</enum>
267284
</property>
268-
<property name="sizeHint" stdset="0" >
285+
<property name="sizeHint" >
269286
<size>
270287
<width>480</width>
271288
<height>21</height>
@@ -286,14 +303,6 @@
286303
</layout>
287304
</widget>
288305
<widget class="QWidget" name="tab2" >
289-
<property name="geometry" >
290-
<rect>
291-
<x>0</x>
292-
<y>0</y>
293-
<width>817</width>
294-
<height>552</height>
295-
</rect>
296-
</property>
297306
<property name="sizePolicy" >
298307
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
299308
<horstretch>0</horstretch>
@@ -400,44 +409,27 @@
400409
<property name="currentIndex" >
401410
<number>1</number>
402411
</property>
403-
<widget class="QWidget" name="page" >
404-
<property name="geometry" >
405-
<rect>
406-
<x>0</x>
407-
<y>0</y>
408-
<width>100</width>
409-
<height>30</height>
410-
</rect>
411-
</property>
412-
</widget>
413-
<widget class="QWidget" name="page_2" >
414-
<property name="geometry" >
415-
<rect>
416-
<x>0</x>
417-
<y>0</y>
418-
<width>799</width>
419-
<height>502</height>
420-
</rect>
421-
</property>
422-
</widget>
412+
<widget class="QWidget" name="page" />
413+
<widget class="QWidget" name="page_2" />
423414
</widget>
424415
</item>
425416
</layout>
426417
</widget>
427418
<widget class="QWidget" name="tab3" >
428-
<property name="geometry" >
429-
<rect>
430-
<x>0</x>
431-
<y>0</y>
432-
<width>817</width>
433-
<height>552</height>
434-
</rect>
435-
</property>
436419
<attribute name="title" >
437420
<string>Metadata</string>
438421
</attribute>
439422
<layout class="QGridLayout" >
440-
<property name="margin" >
423+
<property name="leftMargin" >
424+
<number>11</number>
425+
</property>
426+
<property name="topMargin" >
427+
<number>11</number>
428+
</property>
429+
<property name="rightMargin" >
430+
<number>11</number>
431+
</property>
432+
<property name="bottomMargin" >
441433
<number>11</number>
442434
</property>
443435
<item row="0" column="0" >
@@ -453,14 +445,6 @@
453445
</layout>
454446
</widget>
455447
<widget class="QWidget" name="tab4" >
456-
<property name="geometry" >
457-
<rect>
458-
<x>0</x>
459-
<y>0</y>
460-
<width>817</width>
461-
<height>552</height>
462-
</rect>
463-
</property>
464448
<attribute name="title" >
465449
<string>Labels</string>
466450
</attribute>
@@ -480,6 +464,9 @@
480464
</item>
481465
<item row="1" column="0" >
482466
<widget class="QFrame" name="labelOptionsFrame" >
467+
<property name="enabled" >
468+
<bool>false</bool>
469+
</property>
483470
<property name="sizePolicy" >
484471
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
485472
<horstretch>0</horstretch>
@@ -497,14 +484,6 @@
497484
</layout>
498485
</widget>
499486
<widget class="QWidget" name="tab5" >
500-
<property name="geometry" >
501-
<rect>
502-
<x>0</x>
503-
<y>0</y>
504-
<width>817</width>
505-
<height>552</height>
506-
</rect>
507-
</property>
508487
<attribute name="title" >
509488
<string>Actions</string>
510489
</attribute>
@@ -528,20 +507,12 @@
528507
</layout>
529508
</widget>
530509
<widget class="QWidget" name="tab6" >
531-
<property name="geometry" >
532-
<rect>
533-
<x>0</x>
534-
<y>0</y>
535-
<width>817</width>
536-
<height>557</height>
537-
</rect>
538-
</property>
539510
<attribute name="title" >
540511
<string>Attributes</string>
541512
</attribute>
542-
<layout class="QVBoxLayout" name="verticalLayout" >
513+
<layout class="QVBoxLayout" >
543514
<item>
544-
<layout class="QHBoxLayout" name="horizontalLayout" >
515+
<layout class="QHBoxLayout" >
545516
<property name="sizeConstraint" >
546517
<enum>QLayout::SetNoConstraint</enum>
547518
</property>
@@ -560,8 +531,7 @@
560531
<string/>
561532
</property>
562533
<property name="icon" >
563-
<iconset>
564-
<normaloff>../xpm/new_attribute.png</normaloff>../xpm/new_attribute.png</iconset>
534+
<iconset>../xpm/new_attribute.png</iconset>
565535
</property>
566536
<property name="shortcut" >
567537
<string>Ctrl+N</string>
@@ -577,8 +547,7 @@
577547
<string/>
578548
</property>
579549
<property name="icon" >
580-
<iconset>
581-
<normaloff>../xpm/delete_attribute.png</normaloff>../xpm/delete_attribute.png</iconset>
550+
<iconset>../xpm/delete_attribute.png</iconset>
582551
</property>
583552
<property name="shortcut" >
584553
<string>Ctrl+X</string>
@@ -602,11 +571,11 @@
602571
</widget>
603572
</item>
604573
<item>
605-
<spacer name="horizontalSpacer" >
574+
<spacer>
606575
<property name="orientation" >
607576
<enum>Qt::Horizontal</enum>
608577
</property>
609-
<property name="sizeHint" stdset="0" >
578+
<property name="sizeHint" >
610579
<size>
611580
<width>40</width>
612581
<height>20</height>
@@ -636,8 +605,6 @@
636605
</widget>
637606
</item>
638607
</layout>
639-
<zorder>tblAttributes</zorder>
640-
<zorder></zorder>
641608
</widget>
642609
</widget>
643610
</item>
@@ -667,5 +634,22 @@
667634
<tabstop>tabWidget</tabstop>
668635
</tabstops>
669636
<resources/>
670-
<connections/>
637+
<connections>
638+
<connection>
639+
<sender>labelCheckBox</sender>
640+
<signal>clicked(bool)</signal>
641+
<receiver>labelOptionsFrame</receiver>
642+
<slot>setEnabled(bool)</slot>
643+
<hints>
644+
<hint type="sourcelabel" >
645+
<x>60</x>
646+
<y>53</y>
647+
</hint>
648+
<hint type="destinationlabel" >
649+
<x>61</x>
650+
<y>68</y>
651+
</hint>
652+
</hints>
653+
</connection>
654+
</connections>
671655
</ui>

0 commit comments

Comments
 (0)