summaryrefslogtreecommitdiff
path: root/cui/uiconfig/ui
diff options
context:
space:
mode:
authorKatarina Behrens <bubli@bubli.org>2014-03-29 22:15:41 +0100
committerKatarina Behrens <bubli@bubli.org>2014-03-29 22:32:00 +0100
commit654cea3304572e4d33030c8e60503750b06156a3 (patch)
treed957efbbc72215afb69dd95464d243759ed53dc9 /cui/uiconfig/ui
parentf754176e0fe5a4780694450f65810466e0f4bd99 (diff)
fdo#74287: Correctly enable/disable widgets w/ invisible lines
Restore pre-ui behaviour - disable transparency & width control, but keep colour control active when line contains symbols (e.g. scatter chart) Change-Id: I4005fc376fa1640c5b9d7e736fbdac7417f0edd9
Diffstat (limited to 'cui/uiconfig/ui')
-rw-r--r--cui/uiconfig/ui/linetabpage.ui42
1 files changed, 34 insertions, 8 deletions
diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui
index 85c0f9ff218c..670dfba55cc4 100644
--- a/cui/uiconfig/ui/linetabpage.ui
+++ b/cui/uiconfig/ui/linetabpage.ui
@@ -86,7 +86,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="boxSTYLE_ATTR">
+ <object class="GtkBox" id="boxCOLOR">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -117,6 +117,18 @@
<property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="boxWIDTH">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="FT_LINE_WIDTH">
<property name="visible">True</property>
@@ -129,24 +141,37 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="MTR_FLD_LINE_WIDTH:0cm">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="halign">start</property>
<property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
<property name="adjustment">adjustmentWIDTH</property>
<property name="digits">2</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="boxTRANSPARENCY">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="FT_TRANSPARENT">
<property name="visible">True</property>
@@ -159,28 +184,29 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="MTR_LINE_TRANSPARENT:0%">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="halign">start</property>
<property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
<property name="adjustment">adjustmentPERCENT</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</object>