[gnome-control-center] datetime: Resave the .ui file with recent Glade
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] datetime: Resave the .ui file with recent Glade
- Date: Tue, 6 Aug 2013 14:44:05 +0000 (UTC)
commit c0201168f848a2f86ad2030296f0fa480d1d2f74
Author: Kalev Lember <kalevlember gmail com>
Date: Mon Jul 29 15:45:44 2013 +0200
datetime: Resave the .ui file with recent Glade
No functional changes; this is only to minimize changes in subsequent commits
that touch the .ui file.
https://bugzilla.gnome.org/show_bug.cgi?id=694985
panels/datetime/datetime.ui | 270 +++++++++++++++++++++++++------------------
1 files changed, 160 insertions(+), 110 deletions(-)
---
diff --git a/panels/datetime/datetime.ui b/panels/datetime/datetime.ui
index bdfebca..b0faa0c 100644
--- a/panels/datetime/datetime.ui
+++ b/panels/datetime/datetime.ui
@@ -1,31 +1,117 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
+ <!-- interface-requires gtk+ 3.10 -->
+ <object class="GtkListStore" id="city-liststore">
+ <columns>
+ <!-- column-name city -->
+ <column type="gchararray"/>
+ <!-- column-name region -->
+ <column type="gchararray"/>
+ <!-- column-name city-translated -->
+ <column type="gchararray"/>
+ <!-- column-name region-translated -->
+ <column type="gchararray"/>
+ <!-- column-name zone -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkTreeModelFilter" id="city-modelfilter">
+ <property name="child_model">city-liststore</property>
+ </object>
+ <object class="GtkTreeModelSort" id="city-modelsort">
+ <property name="model">city-modelfilter</property>
+ </object>
+ <object class="GtkListStore" id="day-liststore">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">22</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="month-liststore">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">January</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">February</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">March</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">April</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">May</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">June</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">July</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">August</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">September</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">October</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">November</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">December</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="region-liststore">
+ <columns>
+ <!-- column-name region -->
+ <column type="gchararray"/>
+ <!-- column-name region-translated -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkWindow" id="window1">
+ <property name="can_focus">False</property>
<child>
<object class="GtkAlignment" id="datetime-panel">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="top_padding">16</property>
- <property name="left_padding">16</property>
<property name="bottom_padding">16</property>
+ <property name="left_padding">16</property>
<property name="right_padding">16</property>
<child>
<object class="GtkVBox" id="hbox">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkHBox" id="vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">24</property>
<child>
<object class="GtkVBox" id="map-vbox">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkAspectFrame" id="aspectmap">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -33,16 +119,20 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Region:</property>
<property name="use_underline">True</property>
@@ -50,12 +140,14 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="region_combobox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">region-liststore</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
@@ -65,12 +157,15 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_City:</property>
<property name="use_underline">True</property>
@@ -78,12 +173,14 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="city_combobox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">city-modelsort</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
@@ -93,38 +190,47 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Network Time</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">network_time_switch</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -135,36 +241,44 @@
<property name="receives_default">True</property>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">2</property>
- <property name="expand">False</property>
</packing>
</child>
</object>
<packing>
- <property name="position">0</property>
- <property name="padding">6</property>
<property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">6</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xscale">0</property>
<child>
<object class="GtkTable" id="table2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">3</property>
<property name="n_columns">4</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Translator: this is the
separator between hours and minutes, like in HH:MM">:</property>
<attributes>
<attribute name="weight" value="bold"/>
- <attribute name="scale" value="2.500000"/>
+ <attribute name="scale" value="2.5"/>
</attributes>
</object>
<packing>
@@ -175,12 +289,16 @@
</packing>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkLabel" id="hours_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label">16</property>
<attributes>
<attribute name="weight" value="bold"/>
- <attribute name="scale" value="2.500000"/>
+ <attribute name="scale" value="2.5"/>
</attributes>
</object>
<packing>
@@ -191,10 +309,11 @@
<child>
<object class="GtkLabel" id="minutes_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label">45</property>
<attributes>
<attribute name="weight" value="bold"/>
- <attribute name="scale" value="2.500000"/>
+ <attribute name="scale" value="2.5"/>
</attributes>
</object>
<packing>
@@ -218,6 +337,7 @@
<child>
<object class="GtkArrow" id="arrow1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="arrow_type">up</property>
</object>
</child>
@@ -237,6 +357,7 @@
<child>
<object class="GtkArrow" id="arrow2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="arrow_type">down</property>
</object>
</child>
@@ -260,6 +381,7 @@
<child>
<object class="GtkArrow" id="arrow4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="arrow_type">up</property>
</object>
</child>
@@ -283,6 +405,7 @@
<child>
<object class="GtkArrow" id="arrow3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="arrow_type">down</property>
</object>
</child>
@@ -295,18 +418,12 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="ampm_label">
- <property name="visible">False</property>
+ <property name="can_focus">False</property>
<property name="label">AM</property>
<attributes>
<attribute name="weight" value="bold"/>
- <attribute name="scale" value="2.500000"/>
+ <attribute name="scale" value="2.5"/>
</attributes>
</object>
<packing>
@@ -318,7 +435,6 @@
</child>
<child>
<object class="GtkButton" id="ampm_up_button">
- <property name="visible">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
@@ -330,6 +446,7 @@
<child>
<object class="GtkArrow" id="arrow5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="arrow_type">up</property>
</object>
</child>
@@ -341,7 +458,6 @@
</child>
<child>
<object class="GtkButton" id="ampm_down_button">
- <property name="visible">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
@@ -353,6 +469,7 @@
<child>
<object class="GtkArrow" id="arrow6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="arrow_type">down</property>
</object>
</child>
@@ -369,6 +486,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">12</property>
<property name="position">1</property>
</packing>
@@ -376,10 +494,12 @@
<child>
<object class="GtkHBox" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkComboBox" id="month-combobox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">month-liststore</property>
<child internal-child="accessible">
<object class="AtkObject" id="month-accessible">
@@ -394,13 +514,16 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="day-spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">•</property>
<property name="width_chars">3</property>
<property name="numeric">True</property>
<property name="wrap">True</property>
@@ -411,13 +534,16 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="year-spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">•</property>
<property name="width_chars">5</property>
<property name="numeric">True</property>
<property name="wrap">True</property>
@@ -428,11 +554,15 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">12</property>
<property name="position">2</property>
</packing>
@@ -445,10 +575,10 @@
<child>
<object class="GtkRadioButton" id="24h_button">
<property name="label" translatable="yes">24-hour</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -462,10 +592,10 @@
<child>
<object class="GtkRadioButton" id="12h_button">
<property name="label" translatable="yes">AM/PM</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -488,11 +618,14 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -501,83 +634,6 @@
</object>
</child>
</object>
- <object class="GtkListStore" id="region-liststore">
- <columns>
- <!-- column-name region -->
- <column type="gchararray"/>
- <!-- column-name region-translated -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="city-liststore">
- <columns>
- <!-- column-name city -->
- <column type="gchararray"/>
- <!-- column-name region -->
- <column type="gchararray"/>
- <!-- column-name city-translated -->
- <column type="gchararray"/>
- <!-- column-name region-translated -->
- <column type="gchararray"/>
- <!-- column-name zone -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="month-liststore">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">January</col>
- </row>
- <row>
- <col id="0" translatable="yes">February</col>
- </row>
- <row>
- <col id="0" translatable="yes">March</col>
- </row>
- <row>
- <col id="0" translatable="yes">April</col>
- </row>
- <row>
- <col id="0" translatable="yes">May</col>
- </row>
- <row>
- <col id="0" translatable="yes">June</col>
- </row>
- <row>
- <col id="0" translatable="yes">July</col>
- </row>
- <row>
- <col id="0" translatable="yes">August</col>
- </row>
- <row>
- <col id="0" translatable="yes">September</col>
- </row>
- <row>
- <col id="0" translatable="yes">October</col>
- </row>
- <row>
- <col id="0" translatable="yes">November</col>
- </row>
- <row>
- <col id="0" translatable="yes">December</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="day-liststore">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">22</col>
- </row>
- </data>
- </object>
<object class="GtkListStore" id="year-liststore">
<columns>
<!-- column-name gchararray1 -->
@@ -589,10 +645,4 @@
</row>
</data>
</object>
- <object class="GtkTreeModelFilter" id="city-modelfilter">
- <property name="child_model">city-liststore</property>
- </object>
- <object class="GtkTreeModelSort" id="city-modelsort">
- <property name="model">city-modelfilter</property>
- </object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
