projects
/
psensor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0b28366
)
added specific tab for startup settings
author
Jean-Philippe Orsini
<jeanfi@gmail.com>
Sat, 26 Apr 2014 09:22:23 +0000
(11:22 +0200)
committer
Jean-Philippe Orsini
<jeanfi@gmail.com>
Sat, 26 Apr 2014 09:22:23 +0000
(11:22 +0200)
src/glade/psensor-pref.glade
patch
|
blob
|
history
diff --git
a/src/glade/psensor-pref.glade
b/src/glade/psensor-pref.glade
index
ab2cb8f
..
ec796a0
100644
(file)
--- a/
src/glade/psensor-pref.glade
+++ b/
src/glade/psensor-pref.glade
@@
-117,70
+117,68
@@
<property name="can_focus">False</property>
<property name="column_homogeneous">True</property>
<child>
<property name="can_focus">False</property>
<property name="column_homogeneous">True</property>
<child>
- <object class="GtkLabel" id="label14">
+ <object class="GtkCheckButton" id="hide_window_decoration">
+ <property name="label" translatable="yes">Hide window decoration</property>
<property name="visible">True</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="xalign">0</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="xalign">0</property>
- <property name="
label" translatable="yes">Position of sensors table:
</property>
+ <property name="
draw_indicator">True
</property>
</object>
<packing>
<property name="left_attach">0</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">
8
</property>
- <property name="width">
1
</property>
+ <property name="top_attach">
0
</property>
+ <property name="width">
2
</property>
<property name="height">1</property>
</packing>
</child>
<child>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="temperature_unit">
+ <object class="GtkCheckButton" id="keep_window_below">
+ <property name="label" translatable="yes">Keep window below</property>
<property name="visible">True</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
- <items>
- <item translatable="yes">Celcius</item>
- <item translatable="yes">Fahrenheit</item>
- </items>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
</object>
<packing>
- <property name="left_attach">
1
</property>
- <property name="top_attach">
7
</property>
- <property name="width">
1
</property>
+ <property name="left_attach">
0
</property>
+ <property name="top_attach">
1
</property>
+ <property name="width">
2
</property>
<property name="height">1</property>
</packing>
</child>
<child>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="sensors_list_position">
+ <object class="GtkCheckButton" id="enable_menu">
+ <property name="label" translatable="yes">Enable menu</property>
<property name="visible">True</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
- <property name="model">position_list_store</property>
- <property name="active">0</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
</object>
<packing>
- <property name="left_attach">
1
</property>
- <property name="top_attach">
8
</property>
- <property name="width">
1
</property>
+ <property name="left_attach">
0
</property>
+ <property name="top_attach">
2
</property>
+ <property name="width">
2
</property>
<property name="height">1</property>
</packing>
</child>
<child>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="
hide_window_decoration
">
- <property name="label" translatable="yes">
Hide window decoration
</property>
+ <object class="GtkCheckButton" id="
enable_launcher_counter
">
+ <property name="label" translatable="yes">
Enable Unity Launcher counter
</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@
-193,14
+191,14
@@
</object>
<packing>
<property name="left_attach">0</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">
1
</property>
+ <property name="top_attach">
3
</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="
keep_window_bel
ow">
- <property name="label" translatable="yes">
Keep window below
</property>
+ <object class="GtkCheckButton" id="
restore_wind
ow">
+ <property name="label" translatable="yes">
Restore window position and size
</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@
-213,112
+211,133
@@
</object>
<packing>
<property name="left_attach">0</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">
2
</property>
+ <property name="top_attach">
4
</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="enable_menu">
- <property name="label" translatable="yes">Enable menu</property>
+ <object class="GtkComboBoxText" id="temperature_unit">
<property name="visible">True</property>
<property name="visible">True</property>
- <property name="can_focus">
Tru
e</property>
- <property name="
receives_default">False
</property>
+ <property name="can_focus">
Fals
e</property>
+ <property name="
halign">start
</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <items>
+ <item translatable="yes">Celcius</item>
+ <item translatable="yes">Fahrenheit</item>
+ </items>
</object>
<packing>
</object>
<packing>
- <property name="left_attach">
0
</property>
- <property name="top_attach">
3
</property>
- <property name="width">
2
</property>
+ <property name="left_attach">
1
</property>
+ <property name="top_attach">
5
</property>
+ <property name="width">
1
</property>
<property name="height">1</property>
</packing>
</child>
<child>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="enable_launcher_counter">
- <property name="label" translatable="yes">Enable Unity Launcher counter</property>
+ <object class="GtkComboBox" id="sensors_list_position">
<property name="visible">True</property>
<property name="visible">True</property>
- <property name="can_focus">
Tru
e</property>
- <property name="
receives_default">False
</property>
+ <property name="can_focus">
Fals
e</property>
+ <property name="
halign">start
</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="model">position_list_store</property>
+ <property name="active">0</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
</object>
<packing>
- <property name="left_attach">
0
</property>
- <property name="top_attach">
4
</property>
- <property name="width">
2
</property>
+ <property name="left_attach">
1
</property>
+ <property name="top_attach">
6
</property>
+ <property name="width">
1
</property>
<property name="height">1</property>
</packing>
</child>
<child>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="hide_on_startup">
- <property name="label" translatable="yes">Hide window on startup</property>
+ <object class="GtkLabel" id="temperature_unit_label">
<property name="visible">True</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">False</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="xalign">0</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="xalign">0</property>
- <property name="
draw_indicator">True
</property>
+ <property name="
label" translatable="yes">Temperature unit:
</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
- <property name="width">
2
</property>
+ <property name="width">
1
</property>
<property name="height">1</property>
</packing>
</child>
<child>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="restore_window">
- <property name="label" translatable="yes">Restore window position and size</property>
+ <object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">False</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="xalign">0</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="xalign">0</property>
- <property name="
draw_indicator">True
</property>
+ <property name="
label" translatable="yes">Position of sensors table:
</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
- <property name="width">
2
</property>
+ <property name="width">
1
</property>
<property name="height">1</property>
</packing>
</child>
<property name="height">1</property>
</packing>
</child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="Interface">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Interface</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<child>
- <object class="GtkLabel" id="temperature_unit_label">
+ <object class="GtkCheckButton" id="autostart">
+ <property name="label" translatable="yes">Launch on session startup</property>
<property name="visible">True</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="xalign">0</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Temperature unit:</property>
+ <property name="yalign">0.49000000953674316</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">
7
</property>
+ <property name="top_attach">
0
</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="
autostart
">
- <property name="label" translatable="yes">
Launch on sessi
on startup</property>
+ <object class="GtkCheckButton" id="
hide_on_startup
">
+ <property name="label" translatable="yes">
Hide window
on startup</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@
-331,20
+350,24
@@
</object>
<packing>
<property name="left_attach">0</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">
0
</property>
- <property name="width">
2
</property>
+ <property name="top_attach">
1
</property>
+ <property name="width">
1
</property>
<property name="height">1</property>
</packing>
</child>
</object>
<property name="height">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
<child type="tab">
</child>
<child type="tab">
- <object class="GtkLabel" id="
Interface
">
+ <object class="GtkLabel" id="
label5
">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">
Interface
</property>
+ <property name="label" translatable="yes">
Startup
</property>
</object>
<packing>
</object>
<packing>
+ <property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
<property name="tab_fill">False</property>
</packing>
</child>
@@
-658,7
+681,7
@@
</child>
</object>
<packing>
</child>
</object>
<packing>
- <property name="position">
1
</property>
+ <property name="position">
2
</property>
</packing>
</child>
<child type="tab">
</packing>
</child>
<child type="tab">
@@
-668,7
+691,7
@@
<property name="label" translatable="yes">Graph</property>
</object>
<packing>
<property name="label" translatable="yes">Graph</property>
</object>
<packing>
- <property name="position">
1
</property>
+ <property name="position">
2
</property>
<property name="tab_fill">False</property>
</packing>
</child>
<property name="tab_fill">False</property>
</packing>
</child>
@@
-784,7
+807,7
@@
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
- <property name="label" translatable="yes">Sensors logging interval</property>
+ <property name="label" translatable="yes">Sensors logging interval
:
</property>
</object>
<packing>
<property name="left_attach">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@
-818,7
+841,7
@@
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="margin_right">4</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
- <property name="label" translatable="yes">Script executed when an alarm is raised</property>
+ <property name="label" translatable="yes">Script executed when an alarm is raised
:
</property>
</object>
<packing>
<property name="left_attach">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@
-843,7
+866,7
@@
</child>
</object>
<packing>
</child>
</object>
<packing>
- <property name="position">
2
</property>
+ <property name="position">
3
</property>
<property name="tab_fill">False</property>
</packing>
</child>
<property name="tab_fill">False</property>
</packing>
</child>
@@
-854,7
+877,7
@@
<property name="label" translatable="yes">Sensors</property>
</object>
<packing>
<property name="label" translatable="yes">Sensors</property>
</object>
<packing>
- <property name="position">
2
</property>
+ <property name="position">
3
</property>
<property name="tab_fill">False</property>
</packing>
</child>
<property name="tab_fill">False</property>
</packing>
</child>